]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
Merge remote-tracking branch 'yaccz/add-extractor/freevideo'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 13 Nov 2014 14:53:16 +0000 (15:53 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 13 Nov 2014 14:53:16 +0000 (15:53 +0100)
1  2 
youtube_dl/extractor/__init__.py

Simple merge