edx/edx-platform — pull request #3757 by sarina (2014-05-16 15:12:04+00:00)
Title: Sarina/fix git import

Two of @dianakhuang @cpennington @flowerhack