Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 30 Apr 2014 12:12:41 +0000 (14:12 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 30 Apr 2014 12:12:41 +0000 (14:12 +0200)

Trivial merge