Merge remote-tracking branch 'rupertbaxter2/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 23 Jan 2015 11:05:01 +0000 (12:05 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 23 Jan 2015 11:05:01 +0000 (12:05 +0100)
commit5f0d813d9395848e92a1c6d83335360652d654c1
tree4a7f8ec160f94293c9d5b30404b8cc8a56730e85
parent501f13fbf3d1f7225f91e3e0ad008df2cd3219f1
parentca7a9c1bf7c57d1a5da9a24dd7618d95cb93102a
Merge remote-tracking branch 'rupertbaxter2/master'

Conflicts:
youtube_dl/__init__.py
youtube_dl/downloader/common.py
youtube_dl/YoutubeDL.py
youtube_dl/__init__.py
youtube_dl/downloader/common.py
youtube_dl/options.py