]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge remote-tracking branch 'dz0ny/patch-1'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 20 Nov 2013 05:21:05 +0000 (06:21 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 20 Nov 2013 05:21:05 +0000 (06:21 +0100)
1  2 
youtube_dl/YoutubeDL.py

Simple merge