Update master with hotfixes from release-2013-10-17.

2013-10-18 11:50:42 -04:00
parent 0138322c2b aba8fa6870
commit aa172272f3
107 changed files with 3110 additions and 508 deletions
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -154,6 +154,7 @@ MIDDLEWARE_CLASSES = (

    # Instead of AuthenticationMiddleware, we use a cache-backed version
    'cache_toolbox.middleware.CacheBackedAuthenticationMiddleware',
+    'student.middleware.UserStandingMiddleware',
    'contentserver.middleware.StaticContentServer',

    'django.contrib.messages.middleware.MessageMiddleware',