Unstable state; need to merge from master

2012-05-31 13:44:45 -04:00
parent 9fdbdd3b73
commit 34dc32e5aa
11 changed files with 147 additions and 92 deletions
--- a/djangoapps/courseware/modules/video_module.py
+++ b/djangoapps/courseware/modules/video_module.py
@@ -9,6 +9,9 @@ from x_module import XModule

 log = logging.getLogger("mitx.courseware.modules")

+class ModuleDescriptor(XModuleDescriptor):
+    pass
+
 class Module(XModule):
    id_attribute = 'youtube'
    video_time = 0