Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 26 Aug 2013 19:29:44 +0000 (21:29 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 26 Aug 2013 19:29:44 +0000 (21:29 +0200)

Trivial merge