Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 31 Aug 2014 22:01:48 +0000 (00:01 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 31 Aug 2014 22:01:48 +0000 (00:01 +0200)

Trivial merge