edx/edx-platform — pull request #3199 by auraz (2014-04-03 10:18:11+00:00)
Title: Alex/fix flaky video test 20

Rwrs: @polesye