edx/edx-platform — pull request #3322 by adampalay (2014-04-11 16:55:31+00:00)
Title: Release

Merge release back into master