Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 16 Oct 2013 22:55:06 +0000 (00:55 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 16 Oct 2013 22:55:06 +0000 (00:55 +0200)

Trivial merge