Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 25 Dec 2013 14:24:44 +0000 (15:24 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 25 Dec 2013 14:24:44 +0000 (15:24 +0100)

Trivial merge