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

Simple merge
Simple merge