From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 24 Mar 2014 22:23:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into HEAD
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=b8a792de80404e856139c8a1a801fb370e6ca0e5;p=youtube-dl

Merge remote-tracking branch 'origin/master' into HEAD

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

b8a792de80404e856139c8a1a801fb370e6ca0e5