cms · aa92320c934c44d5ebd35c31444c7ed50ae9cda0 · edx / edx-platform

Merge branch 'release' into edx-west/release-candidate-try · b6ea50d5

Conflicts:
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/external_auth/views.py
	common/djangoapps/student/views.py
	lms/envs/common.py
	lms/envs/test.py

committed Jun 28, 2013

b6ea50d5

Name	Last commit	Last update
..
djangoapps		Loading commit data...
envs		Loading commit data...
static		Loading commit data...
templates		Loading commit data...
.coveragerc		Loading commit data...
__init__.py		Loading commit data...
manage.py		Loading commit data...
one_time_startup.py		Loading commit data...
pydev_manage.py		Loading commit data...
urls.py		Loading commit data...
xmodule_namespace.py		Loading commit data...