common/lib · 17c710af83dae40beac3c8daf8c5f4c6029fa3d5 · edx / edx-platform

Merge branch 'master' into feature/christina/metadata-ui · 17c710af

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml

committed May 27, 2013

17c710af

Name	Last commit	Last update
..
calc		Loading commit data...
capa		Loading commit data...
chem		Loading commit data...
sandbox-packages		Loading commit data...
xmodule		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...