cms/templates/widgets · f22523b33a5293a6ac8e08f16f20159ee9c38dbb · 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
..
captions.html		Loading commit data...
footer.html		Loading commit data...
header.html		Loading commit data...
html-edit.html		Loading commit data...
import-course.html		Loading commit data...
metadata-edit.html		Loading commit data...
metadata-only-edit.html		Loading commit data...
module-dropdown.html		Loading commit data...
new-module.html		Loading commit data...
notes.html		Loading commit data...
open-ended-edit.html		Loading commit data...
problem-edit.html		Loading commit data...
qualaroo.html		Loading commit data...
raw-edit.html		Loading commit data...
save-captions.html		Loading commit data...
segment-io.html		Loading commit data...
sequence-edit.html		Loading commit data...
sock.html		Loading commit data...
source-edit.html		Loading commit data...
speed-tooltip.html		Loading commit data...
tender.html		Loading commit data...
units.html		Loading commit data...
upload_assets.html		Loading commit data...
video-box-unused.html		Loading commit data...
video-box.html		Loading commit data...
video-edit.html		Loading commit data...
video-new.html		Loading commit data...