Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 29 Oct 2013 05:48:18 +0000 (06:48 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 29 Oct 2013 05:48:18 +0000 (06:48 +0100)

Trivial merge