Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 17 Jul 2014 20:32:54 +0000 (22:32 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 17 Jul 2014 20:32:54 +0000 (22:32 +0200)

Trivial merge