From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 7 Jun 2014 13:21:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'georgjaehnig/spiegeltv'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=4e0fb1280a8c1b392e5ce71aff796c94a12976a0

Merge remote-tracking branch 'georgjaehnig/spiegeltv'
---

4e0fb1280a8c1b392e5ce71aff796c94a12976a0