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)
commitebdb64d60511cc281c14431b894091bf32a6b97b
treec1bca48aadb2209405e9ae64f954e4928c53e78f
parenta6ffb92f0ba9b64b82a56bcf8417744ff3e829f3
parenta45e6aadd7c8aa42d769b9c0ee0c7d29258efcf1
Merge remote-tracking branch 'pulpe/tagesschau'