]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Mar 2015 02:01:28 +0000 (03:01 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Mar 2015 02:01:28 +0000 (03:01 +0100)
Conflicts:
youtube_dl/YoutubeDL.py


Trivial merge