edx/edx-platform — pull request #5593 by mhoeber (2014-10-15 18:28:12+00:00)
Title: TEST CHANGE - DO NOT MERGE

TEST