lms/djangoapps/open_ended_grading · 07059d0dfc5c0d20cd00fb84dbfa0a2bc254416a · 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...
open_ended_notifications.py		Loading commit data...
staff_grading.py		Loading commit data...
staff_grading_service.py		Loading commit data...
tests.py		Loading commit data...
views.py		Loading commit data...