Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 6 Sep 2013 08:53:24 +0000 (10:53 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 6 Sep 2013 08:53:24 +0000 (10:53 +0200)

Trivial merge