Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 4 Oct 2013 09:14:20 +0000 (11:14 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 4 Oct 2013 09:14:20 +0000 (11:14 +0200)

Trivial merge