lms/envs · 0297aff7610a88be8b4af2923be82db2777af2e7 · 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
..
devgroups		Loading commit data...
README.txt		Loading commit data...
__init__.py		Loading commit data...
askbotsettings.py		Loading commit data...
aws.py		Loading commit data...
common.py		Loading commit data...
content.py		Loading commit data...
dev.py		Loading commit data...
dev_edx4edx.py		Loading commit data...
dev_ike.py		Loading commit data...
dev_mongo.py		Loading commit data...
devplus.py		Loading commit data...
edx4edx_aws.py		Loading commit data...
logsettings.py		Loading commit data...
static.py		Loading commit data...
test.py		Loading commit data...
test_ike.py		Loading commit data...
with_cms.py		Loading commit data...

README.txt