Merge remote-tracking branch 'codesparkle/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 30 Jan 2015 09:56:53 +0000 (10:56 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 30 Jan 2015 09:56:53 +0000 (10:56 +0100)

Trivial merge