]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge branch 'cliphunter' of https://github.com/pornophage/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 27 Jan 2014 06:48:51 +0000 (07:48 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 27 Jan 2014 06:48:51 +0000 (07:48 +0100)
1  2 
youtube_dl/extractor/__init__.py

Simple merge