Merge remote-tracking branch 'mfischer/groff' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 16:54:07 +0000 (17:54 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 16:54:07 +0000 (17:54 +0100)

Trivial merge