edx/edx-platform — pull request #4430 by feanil (2014-07-15 17:56:13+00:00)
Title: Feanil/fix bokchoy

@jzoldak This should un-break bok-choy tests on devstack.