Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 28 Aug 2013 10:57:44 +0000 (12:57 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 28 Aug 2013 10:57:44 +0000 (12:57 +0200)

Trivial merge