Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 4 Feb 2014 15:33:06 +0000 (16:33 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 4 Feb 2014 15:33:06 +0000 (16:33 +0100)

Trivial merge