edx/edx-platform — pull request #4088 by wedaly (2014-06-13 12:07:29+00:00)
Title: ORA2 release-2014-06-13T11.52

@stephensanchez Looks good?
@mulby We'll need to get this into the release candidate, since it contains two last-minute bugfixes.