doc · 094b18972c6ed0e5add754b1022fd8b9ed0b5a00 · 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
..
public		Loading commit data...
README		Loading commit data...
code_standards.txt		Loading commit data...
development.md		Loading commit data...
discussion.md		Loading commit data...
mongo.md		Loading commit data...
overview.md		Loading commit data...
remote_gradebook.md		Loading commit data...
testing.md		Loading commit data...

README