Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 16 May 2014 10:04:24 +0000 (12:04 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 16 May 2014 10:04:24 +0000 (12:04 +0200)

Trivial merge