common/lib · a0e8606c8a2bcc3f76bfab1e2605ac4c6bea2233 · edx / edx-platform

edX's 2014-08-14 hotfix release pt 2

Conflicts:
	AUTHORS
	cms/djangoapps/contentstore/views/checklist.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/course.py
	cms/djangoapps/models/settings/course_metadata.py
	common/djangoapps/student/tests/test_password_policy.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_draft_modulestore.py
	lms/djangoapps/analytics/basic.py
	lms/envs/common.py
	requirements/edx/base.txt
	requirements/edx/github.txt

committed Aug 25, 2014

2c53a83b

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...