Bridger Maxwell 4fedca5bf9 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading ...

Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py

2012-08-06 16:49:05 -04:00

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

xmodule

Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading

2012-08-06 16:49:05 -04:00

setup.py

Rename MalformedDescriptor to ErrorDescriptor

2012-08-01 11:42:39 -04:00