Merge remote-tracking branch 'sahutd/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 19 Jan 2014 05:12:20 +0000 (06:12 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 19 Jan 2014 05:12:20 +0000 (06:12 +0100)

Trivial merge