Merge remote-tracking branch 'origin/HEAD'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Jun 2013 15:58:42 +0000 (17:58 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Jun 2013 15:58:42 +0000 (17:58 +0200)

Trivial merge