Merge remote-tracking branch 'chrisjrn/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Nov 2012 11:25:51 +0000 (12:25 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Nov 2012 11:25:51 +0000 (12:25 +0100)

Trivial merge