edx/edx-platform — pull request #3297 by adampalay (2014-04-09 21:17:17+00:00)
Title: Merge release into master

Merged release into locally and pushed this branch for tests