Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 21 Aug 2014 16:01:33 +0000 (18:01 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 21 Aug 2014 16:01:33 +0000 (18:01 +0200)

Trivial merge