Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 28 Oct 2014 08:13:23 +0000 (09:13 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 28 Oct 2014 08:13:23 +0000 (09:13 +0100)

Trivial merge