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)
commitba655a0e4c0a80bc45d648e56ec3eb5777d599ac
treed90fdfbfd384e053c1b49f252f28bd357a6c581a
parentb59c17e543206220c1809ab0fe6131280dd02b1f
parent3d5f7a3947a8d304bc7ad46217f171996e95c475
Merge remote-tracking branch 'derrotebaron/master'
youtube_dl/utils.py