Merge remote-tracking branch 'kwbr/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 21 Apr 2014 00:48:04 +0000 (02:48 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 21 Apr 2014 00:48:04 +0000 (02:48 +0200)

Trivial merge