]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge remote-tracking branch 'patrickslin/patch-4'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 7 Aug 2013 18:19:51 +0000 (20:19 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 7 Aug 2013 18:19:51 +0000 (20:19 +0200)
1  2 
youtube_dl/extractor/youtube.py

Simple merge