Merge remote-tracking branch 'Oteng/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 5 Jan 2015 17:18:15 +0000 (18:18 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 5 Jan 2015 17:18:15 +0000 (18:18 +0100)

Trivial merge