]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/commitdiff
Merge remote-tracking branch 'stevee/xorg-x11-font-utils'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 12 Oct 2011 15:20:53 +0000 (17:20 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 12 Oct 2011 15:20:53 +0000 (17:20 +0200)

Trivial merge