Merge remote-tracking branch 'xantares/goldenmoustache'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 12 Nov 2014 14:34:31 +0000 (15:34 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 12 Nov 2014 14:34:31 +0000 (15:34 +0100)

Trivial merge