test_courses.py
2.76 KB
-
Merge remote-tracking branch 'origin/release' into edx-west/release-candidate-20130711 · a879b3ee
Conflicts: cms/templates/widgets/header.html lms/djangoapps/courseware/courses.py lms/djangoapps/courseware/tests/test_courses.py
Jason Bau committed