]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Jun 2013 18:47:03 +0000 (20:47 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Jun 2013 18:47:03 +0000 (20:47 +0200)
1  2 
youtube_dl/extractor/generic.py

Simple merge