]> gitweb @ CieloNegro.org - youtube-dl.git/commit
Merge remote-tracking branch 'origin/master' into HEAD
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 24 Mar 2014 22:23:17 +0000 (23:23 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 24 Mar 2014 22:23:17 +0000 (23:23 +0100)
commitb8a792de80404e856139c8a1a801fb370e6ca0e5
treecc39bdd51b94c38e16aaa1815f31015ced933b2d
parentfac55558ad55344d72cf66033e5f2d2076b2f8cb
parentb2799ff96d77baf614445adeac914b4277adb374
Merge remote-tracking branch 'origin/master' into HEAD

Conflicts:
youtube_dl/extractor/arte.py
youtube_dl/extractor/arte.py