Merge remote-tracking branch 'alphapapa/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 15 Oct 2013 02:52:07 +0000 (04:52 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 15 Oct 2013 02:52:07 +0000 (04:52 +0200)
commitf219743e33a9a640bfc3845d74282774e51e1ad4
treec296dcaa1eabdb15094611a929e46c05fdb58aef
parent4f41664de8e0486127d8dd16168d829c26f79fdf
parent0025da15cf310a58ee8f124e395bc1bd52fab5c8
Merge remote-tracking branch 'alphapapa/master'
youtube_dl/__init__.py