edx/edx-platform — pull request #6150 by BenjiLee (2014-12-04 21:20:05+00:00)
Title: Release hotfix-2014-12-03

hotfix-2014-12-03