Merge remote-tracking branch 'naglis/turbo'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 15 Sep 2014 13:48:48 +0000 (15:48 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 15 Sep 2014 13:48:48 +0000 (15:48 +0200)

Trivial merge