Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 22 Aug 2014 15:38:11 +0000 (17:38 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 22 Aug 2014 15:38:11 +0000 (17:38 +0200)

Trivial merge