lms/djangoapps/open_ended_grading · ba1cd8117fc2f5d995338f4f1df6f1bcb6d6dd08 · edx / edx-platform

Merge branch 'master' into diana/open-ended-ui-updates · 2e791043

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py

committed Jan 18, 2013

2e791043

Name	Last commit	Last update
..
__init__.py		Loading commit data...
grading_service.py		Loading commit data...
peer_grading_service.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...