Merge remote-tracking branch 'r4mos/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 16 Sep 2014 21:33:26 +0000 (23:33 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 16 Sep 2014 21:33:26 +0000 (23:33 +0200)

Trivial merge