Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 24 Sep 2013 19:40:30 +0000 (21:40 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 24 Sep 2013 19:40:30 +0000 (21:40 +0200)

Trivial merge