Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 22 Jul 2014 14:59:31 +0000 (16:59 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 22 Jul 2014 14:59:31 +0000 (16:59 +0200)

Trivial merge