Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 20 Jul 2014 16:32:59 +0000 (18:32 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 20 Jul 2014 16:32:59 +0000 (18:32 +0200)

Trivial merge