Merge remote-tracking branch 'Tithen-Firion/hsw-update'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 12 Dec 2014 03:10:55 +0000 (04:10 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 12 Dec 2014 03:10:55 +0000 (04:10 +0100)
1  2 
youtube_dl/extractor/common.py

Simple merge