Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 20 Nov 2014 23:17:58 +0000 (00:17 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 20 Nov 2014 23:17:58 +0000 (00:17 +0100)

Trivial merge