edx/edx-platform — pull request #2879 by feanil (2014-03-10 15:31:15+00:00)
Title: Feanil/xavier rc cale fix

Cale's hotfix with imports reverted to not break manage.py.