Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 15 Sep 2014 13:11:15 +0000 (15:11 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 15 Sep 2014 13:11:15 +0000 (15:11 +0200)

Trivial merge