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)
Conflicts:
youtube_dl/extractor/arte.py

1  2 
youtube_dl/extractor/arte.py

Simple merge