Merge branch 'master' into feature/will/ci-lettuce-tests

2013-05-13 14:08:06 -04:00
parent baa7916aa7 e122efc5a3
commit d1e35b14bb
124 changed files with 4687 additions and 2257 deletions
--- a/common/djangoapps/terrain/course_helpers.py
+++ b/common/djangoapps/terrain/course_helpers.py
@@ -137,4 +137,4 @@ def clear_courses():
    # $ mongo test_xmodule --eval "db.dropDatabase()"
    _MODULESTORES = {}
    modulestore().collection.drop()
-    update_templates()
+    update_templates(modulestore('direct'))