From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 7 Jun 2014 10:43:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'pulpe/tagesschau'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ebdb64d60511cc281c14431b894091bf32a6b97b;p=youtube-dl

Merge remote-tracking branch 'pulpe/tagesschau'
---

ebdb64d60511cc281c14431b894091bf32a6b97b