Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 16 Sep 2013 01:32:53 +0000 (03:32 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 16 Sep 2013 01:32:53 +0000 (03:32 +0200)

Trivial merge