Merge remote-tracking branch 'pulpe/tagesschau'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 7 Jun 2014 10:43:31 +0000 (12:43 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 7 Jun 2014 10:43:31 +0000 (12:43 +0200)

Trivial merge