Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 2 Feb 2015 19:32:07 +0000 (20:32 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 2 Feb 2015 19:32:07 +0000 (20:32 +0100)
commitea71034bd3965de8ff7239516776296e2c9857c3
treebd4a637859aeb49ffabe19c798b07ccaab677ee1
parent9fffd0469f1353c5f5e96b91a87e34d02ae7491a
parentae7773942ecf816e9592e55bdef7234f41c89c85
Merge remote-tracking branch 'origin/master'

Conflicts:
youtube_dl/downloader/external.py