Merge remote-tracking branch 'grompe/patch-1'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 12 Dec 2014 10:35:04 +0000 (11:35 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 12 Dec 2014 10:35:04 +0000 (11:35 +0100)
1  2 
youtube_dl/utils.py

Simple merge