Merge branch 'stable'

CHANGELOG.md

@@ -17,6 +17,9 @@ CHANGELOG
 
 --------------------
 
+## 5.11.4 (2016-08-16)
+_(none)_
+
 ## 5.11.3 (2016-08-15)
 * @vdeshpande fixed control text for fullscreen button ([view](https://github.com/videojs/video.js/pull/3485))
 * @mister-ben fixed android treating swipe as a tap ([view](https://github.com/videojs/video.js/pull/3514))

component.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.11.3",
+  "version": "5.11.4",
   "keywords": [
     "videojs",
     "html5",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.11.3",
+  "version": "5.11.4",
   "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
   "license": "Apache-2.0",
   "keywords": [