Merge remote-tracking branch 'dstftw/novamov'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 8 Jan 2014 00:15:43 +0000 (01:15 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 8 Jan 2014 00:15:43 +0000 (01:15 +0100)

Trivial merge