ichuang 9b90068e03 Merge branch 'stable-edx4edx' of github.com:MITx/mitx ...

Conflicts:
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/xmodule/capa_module.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/multicourse/multicourse_settings.py

2012-07-08 16:52:36 -04:00

..

dogfood

Merge branch 'stable-edx4edx' of github.com:MITx/mitx

2012-07-08 16:52:36 -04:00

loncapa

typo in loncapa_check

2012-07-03 17:06:39 -04:00

newrelic_logging

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

perfstats

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

symmath

improved symmath error handling for matrix shape mismatch

2012-06-23 17:05:09 -04:00