lms/djangoapps · 801df37872649c9bd4c66bd70f2adc5e02087a5b · edx / edx-platform

Merge remote-tracking branch 'origin/master' into arjun/javascript_response · 801df378

Conflicts:
	common/lib/xmodule/xmodule/js/src/capa/display.coffee
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/module_render.py

committed Aug 13, 2012

801df378

Name	Last commit	Last update
..
certificates		Loading commit data...
circuit		Loading commit data...
courseware		Loading commit data...
dashboard		Loading commit data...
heartbeat		Loading commit data...
lms_migration		Loading commit data...
multicourse		Loading commit data...
simplewiki		Loading commit data...
static_template_view		Loading commit data...
staticbook		Loading commit data...