cms/djangoapps/contentstore/tests · 5222c61d73cbd7a979242ba2cc2642d258cc8e24 · edx / edx-platform

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 8a9ba79d

Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py

committed Mar 06, 2013

8a9ba79d

Name	Last commit	Last update
..
__init__.py		Loading commit data...
test_contentstore.py		Loading commit data...
test_core_caching.py		Loading commit data...
test_course_settings.py		Loading commit data...
test_course_updates.py		Loading commit data...
test_utils.py		Loading commit data...
tests.py		Loading commit data...
utils.py		Loading commit data...