edx/edx-platform — pull request #4157 by adampalay (2014-06-18 20:33:31+00:00)
Title: Release

merge release into master