common/lib · 4fcc59b3182cef48fb87da4be42a35d987e55650 · 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
..
calc		Loading commit data...
capa		Loading commit data...
chem		Loading commit data...
sandbox-packages		Loading commit data...
symmath		Loading commit data...
xmodule		Loading commit data...
django_startup.py		Loading commit data...
extract_tar.py		Loading commit data...
html_to_text.py		Loading commit data...
logsettings.py		Loading commit data...
mail_utils.py		Loading commit data...
rooted_paths.py		Loading commit data...
supertrace.py		Loading commit data...
tempdir.py		Loading commit data...
test_generate.py		Loading commit data...