lms/djangoapps/courseware/features · 7b3ab952f3a2bc185682cac71d0588dfa1d8ecb3 · edx / edx-platform

Merge remote-tracking branch 'origin/feature/kluo/bulk-email-squashed' into… · c534a2d5

Merge remote-tracking branch 'origin/feature/kluo/bulk-email-squashed' into edx-west/release-candidate-20130729

Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	lms/djangoapps/courseware/views.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/courseware/courseware.html

committed Jul 25, 2013

c534a2d5

Name	Last commit	Last update
..
common.py		Loading commit data...
courseware.py		Loading commit data...
courseware_common.py		Loading commit data...
high-level-tabs.feature		Loading commit data...
high-level-tabs.py		Loading commit data...
homepage.feature		Loading commit data...
homepage.py		Loading commit data...
login.feature		Loading commit data...
login.py		Loading commit data...
navigation.feature		Loading commit data...
navigation.py		Loading commit data...
openended.feature		Loading commit data...
openended.py		Loading commit data...
problems.feature		Loading commit data...
problems.py		Loading commit data...
problems_setup.py		Loading commit data...
registration.feature		Loading commit data...
registration.py		Loading commit data...
signup.feature		Loading commit data...
signup.py		Loading commit data...
video.feature		Loading commit data...
video.py		Loading commit data...
xqueue_setup.py		Loading commit data...