Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 9 Nov 2014 07:30:12 +0000 (08:30 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 9 Nov 2014 07:30:12 +0000 (08:30 +0100)

Trivial merge