cms/djangoapps/contentstore · d303041c557c3759263dcb13be044d3e51adbaf7 · edx / edx-platform

Merge branch 'release' into andya/merge-hotfix-2014-08-29 · 7b26e854

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

7b26e854

Name	Last commit	Last update
..
features		Loading commit data...
management		Loading commit data...
tests		Loading commit data...
views		Loading commit data...
__init__.py		Loading commit data...
context_processors.py		Loading commit data...
course_info_model.py		Loading commit data...
debug_file_uploader.py		Loading commit data...
git_export_utils.py		Loading commit data...
tasks.py		Loading commit data...
utils.py		Loading commit data...