Merge pull request #1414 from edx/will/zero-tolerance

Zero Tolerance

common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js

@@ -567,7 +567,8 @@
             });
         });
 
-        describe('seekPlayer', function () {
+        // Disabled 10/9/13 due to flakiness in master
+        xdescribe('seekPlayer', function () {
             describe('when the video speed is 1.0x', function () {
                 beforeEach(function () {
                     videoSpeedControl.currentSpeed = '1.0';