edx/edx-platform — pull request #2759 by adampalay (2014-02-27 22:35:51+00:00)
Title: Release and merge conflict resolution

merging in the release branch, plus resolving merge conflicts