Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 23 Sep 2013 09:24:49 +0000 (11:24 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 23 Sep 2013 09:24:49 +0000 (11:24 +0200)

Trivial merge