common/lib · 845e86b8d1da707dee5f7c00c394b68a7e55c434 · edx / edx-platform

Merge branch 'master' into bug/christina/studio · 93b0fafe

Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py

committed Apr 01, 2013

93b0fafe

Name	Last commit	Last update
..
capa		Loading commit data...
xmodule		Loading commit data...
.gitignore		Loading commit data...
logsettings.py		Loading commit data...
rooted_paths.py		Loading commit data...
sample-post.py		Loading commit data...
supertrace.py		Loading commit data...
tempdir.py		Loading commit data...