Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 18 Feb 2015 23:01:14 +0000 (00:01 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 18 Feb 2015 23:01:14 +0000 (00:01 +0100)

Trivial merge