Merge remote-tracking branch 'xavierbeynon/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 10 Jan 2015 01:03:46 +0000 (02:03 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 10 Jan 2015 01:03:46 +0000 (02:03 +0100)
1  2 
youtube_dl/extractor/__init__.py

Simple merge