Merge remote-tracking branch 'jaimeMF/youtubedl_class'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 24 Jun 2013 08:48:41 +0000 (10:48 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 24 Jun 2013 08:48:41 +0000 (10:48 +0200)

Trivial merge