lms/djangoapps/django_comment_client · 137662081fa1b7e9a06520eb399abb8bcdc5a11c · edx / edx-platform

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 21135416

Conflicts:
	.ruby-version
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/models/settings/course_metadata.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py

committed Mar 12, 2013

21135416

Name	Last commit	Last update
..
base		Loading commit data...
forum		Loading commit data...
management		Loading commit data...
migrations		Loading commit data...
tests		Loading commit data...
__init__.py		Loading commit data...
helpers.py		Loading commit data...
middleware.py		Loading commit data...
models.py		Loading commit data...
mustache_helpers.py		Loading commit data...
permissions.py		Loading commit data...
settings.py		Loading commit data...
tests.py		Loading commit data...
urls.py		Loading commit data...
utils.py		Loading commit data...