Merge remote-tracking branch 'origin/release'

2013-10-25 15:28:47 -04:00
parent 832e262400 6993161d14
commit dc589f723c
7 changed files with 106 additions and 48 deletions
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -751,6 +751,7 @@ class XModuleDescriptor(XModuleMixin, HTMLSnippet, ResourceTemplates, XBlock):
    handle_ajax = module_attr('handle_ajax')
    max_score = module_attr('max_score')
    student_view = module_attr('student_view')
+    get_child_descriptors = module_attr('get_child_descriptors')

    # ~~~~~~~~~~~~~~~ XBlock API Wrappers ~~~~~~~~~~~~~~~~
    def studio_view(self, _context):