Merge remote-tracking branch 'akretz/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 11 Dec 2014 15:35:45 +0000 (16:35 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 11 Dec 2014 15:35:45 +0000 (16:35 +0100)

Trivial merge