Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 27 Aug 2014 23:01:04 +0000 (01:01 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 27 Aug 2014 23:01:04 +0000 (01:01 +0200)

Trivial merge