Merge remote-tracking branch 'joelverhagen/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Nov 2012 15:41:16 +0000 (16:41 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Nov 2012 15:41:16 +0000 (16:41 +0100)

Trivial merge