Merge remote-tracking branch 'JohnyMoSwag/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Jun 2013 15:52:41 +0000 (17:52 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Jun 2013 15:52:41 +0000 (17:52 +0200)

Trivial merge