Merge remote-tracking branch 'mharrys/aftonbladet'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 10 Mar 2014 09:23:45 +0000 (10:23 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 10 Mar 2014 09:23:45 +0000 (10:23 +0100)

Trivial merge