edx/edx-platform — pull request #751 by lapentab (2013-08-20 17:54:32+00:00)
Title: DO NOT MERGE

DO NOT MERGE