edx/edx-platform — pull request #4428 by sarina (2014-07-15 14:20:52+00:00)
Title: Revert "Pull out edX into variables in password reset email"

This reverts commit 3a2276b5374fb63b4675ebf627f79b4eaf28c686.