edx/edx-platform — pull request #2739 by adampalay (2014-02-26 20:13:01+00:00)
Title: Release

Merging release into master