src() called as a getter should return the video src
It can be handy that src() returns the player object when it is invoked but it does not match the behavior of the corresponding property on the video element. Ignoring the spec however, while the video element is running the resource selection algorithm, currentSrc may be undefined. If the video source has been specified through an attribute on the video element, src() is the natural way to expose that URL programmatically. Without this change, it's necessary to bypass the player and interact with the tech directly to determine the value of the src attribute.
Add component.json file
There was no semicolon

There was no semicolon
Bump version
Merge pull request #1040 from ange007/patch-2

There was no semicolon
Made the src method return the player when setting, and made Flash return the current srouce for flash.src()
Merge branch 'add/component-support' of git://github.com/peteschaffner/video.js into peteschaffner-add/component-support
Updated changelog
Move captions down when controls are inactive
Whitespace changes
Updated contrib.json with feature workflow
Merge branch 'stable'
Merge branch 'master' of git://github.com/harhoo/video.js into harhoo-master
Added line to the change log
Fixed captions positioning when player isn't playing
Use .npmignore to package a smaller subset of videojs for distribution. Make sure to include the video-js.less file for the designer to use.
Added line to the changelog
Merge pull request #1 from heff/bugfix/src-getter

Made the src method return the player when setting
Update setup.md
Merge branch 'bugfix/src-getter' of git://github.com/dmlap/video-js into dmlap-bugfix/src-getter

Conflicts:
	src/js/media/flash.js