Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 29 Jun 2013 18:21:13 +0000 (20:21 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 29 Jun 2013 18:21:13 +0000 (20:21 +0200)

Trivial merge