Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx

This commit is contained in:
ichuang
2012-06-29 16:22:49 -04:00
4 changed files with 10 additions and 8 deletions

View File

@@ -14,7 +14,7 @@
import logging
log = logging.getLogger("mitx.common.lib.mitxmako")
log = logging.getLogger("mitx." + __name__)
from django.template import Context
from django.http import HttpResponse