Merge remote-tracking branch 'ruuk/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 25 Feb 2014 23:31:08 +0000 (00:31 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 25 Feb 2014 23:31:08 +0000 (00:31 +0100)

Trivial merge