Merge remote-tracking branch 'derrotebaron/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 23 Jan 2015 00:32:52 +0000 (01:32 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 23 Jan 2015 00:32:52 +0000 (01:32 +0100)
1  2 
youtube_dl/utils.py

Simple merge