edx/edx-platform — pull request #4374 by cahrens (2014-07-10 19:53:59+00:00)
Title: Discard changes rewrite.

STUD-1860