Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 28 Aug 2013 16:22:33 +0000 (18:22 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 28 Aug 2013 16:22:33 +0000 (18:22 +0200)

Trivial merge