lms · 4fcc59b3182cef48fb87da4be42a35d987e55650 · edx / edx-platform

Merge branch 'release' into andya/merge-hotfix-2014-08-29 · 4fcc59b3

Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py

committed Aug 29, 2014

4fcc59b3

Name	Last commit	Last update
..
djangoapps		Loading commit data...
envs		Loading commit data...
lib		Loading commit data...
static		Loading commit data...
templates		Loading commit data...
.coveragerc		Loading commit data...
__init__.py		Loading commit data...
startup.py		Loading commit data...
tests.py		Loading commit data...
urls.py		Loading commit data...
wsgi.py		Loading commit data...
wsgi_apache_lms.py		Loading commit data...