Merge remote-tracking branch 'fstirlitz/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 13 Dec 2014 22:05:41 +0000 (23:05 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 13 Dec 2014 22:05:41 +0000 (23:05 +0100)
1  2 
youtube_dl/extractor/comcarcoff.py

Simple merge