edx/edx-platform — pull request #3293 by adampalay (2014-04-09 20:08:47+00:00)
Title: Release

Merge release back into master