edx/edx-platform — pull request #6004 by bradenmacdonald (2014-11-20 18:06:02+00:00)
Title: fixup! Upgraded to Django 1.5

@cpennington this fixes errors related to video xmodule.