Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 23 Oct 2013 09:40:46 +0000 (11:40 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 23 Oct 2013 09:40:46 +0000 (11:40 +0200)

Trivial merge