edx/edx-platform — pull request #6355 by fredsmith (2014-12-22 23:14:38+00:00)
Title: Release

Merge hotfixes to release back into master