Merge remote-tracking branch 'Asido/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Nov 2012 17:48:43 +0000 (18:48 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Nov 2012 17:48:43 +0000 (18:48 +0100)
1  2 
youtube_dl/utils.py

Simple merge