Merge remote-tracking branch 'fstirlitz/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 12 Dec 2014 19:17:26 +0000 (20:17 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 12 Dec 2014 19:17:26 +0000 (20:17 +0100)

Trivial merge