edx/edx-platform — pull request #6254 by gwprice (2014-12-15 16:29:33+00:00)
Title: Add video upload feature to Studio

Clone of #6108 for merging into RC branch