Merge remote-tracking branch 'pishposhmcgee/patch-2'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 25 Jul 2013 07:34:56 +0000 (09:34 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 25 Jul 2013 07:34:56 +0000 (09:34 +0200)

Trivial merge