lms/djangoapps · 2aad7d0acddd33e3a28a7c811d8df1e6af36225a · edx / edx-platform

Merge commit '' into edx-west/release · 9ae71a31

Conflicts:
	cms/djangoapps/contentstore/utils.py
	cms/templates/login.html
	cms/templates/widgets/header.html
	cms/templates/widgets/sock.html
	lms/envs/test.py

committed Jul 18, 2013

9ae71a31

Name	Last commit	Last update
..
branding		Loading commit data...
certificates		Loading commit data...
circuit		Loading commit data...
course_wiki		Loading commit data...
courseware		Loading commit data...
dashboard		Loading commit data...
debug		Loading commit data...
django_comment_client		Loading commit data...
foldit		Loading commit data...
instructor		Loading commit data...
instructor_task		Loading commit data...
jabber		Loading commit data...
licenses		Loading commit data...
lms_migration		Loading commit data...
multicourse		Loading commit data...
notes		Loading commit data...
open_ended_grading		Loading commit data...
psychometrics		Loading commit data...
static_template_view		Loading commit data...
staticbook		Loading commit data...