edx/edx-platform — pull request #4243 by lamagnifica (2014-06-27 20:17:03+00:00)
Title: Updated for PR 4106, BLD-1134

@stroilova @rocha please let me know.
@mhoeber , @srpearce FYI