Merge branch 'release' from 2014-08-12 release.

2014-08-12 13:51:58 -04:00
parent e727bd2202 ad37d93d24
commit ee836d4c40
8 changed files with 18 additions and 6 deletions
--- a/cms/djangoapps/models/settings/course_metadata.py
+++ b/cms/djangoapps/models/settings/course_metadata.py
@@ -24,10 +24,8 @@ class CourseMetadata(object):
                     'graded',
                     'hide_from_toc',
                     'pdf_textbooks',
-                     'user_partitions',
                     'name',  # from xblock
                     'tags',  # from xblock
-                     'video_speed_optimizations',
                     'visible_to_staff_only'
    ]