lms/envs · 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
..
cms		Loading commit data...
devgroups		Loading commit data...
README.txt		Loading commit data...
__init__.py		Loading commit data...
acceptance.py		Loading commit data...
aws.py		Loading commit data...
aws_migrate.py		Loading commit data...
common.py		Loading commit data...
content.py		Loading commit data...
dev.py		Loading commit data...
dev_edx4edx.py		Loading commit data...
dev_ike.py		Loading commit data...
dev_int.py		Loading commit data...
dev_mongo.py		Loading commit data...
dev_with_worker.py		Loading commit data...
devplus.py		Loading commit data...
discussionsettings.py		Loading commit data...
edx4edx_aws.py		Loading commit data...
jasmine.py		Loading commit data...
static.py		Loading commit data...
test.py		Loading commit data...

README.txt