]> git.ipfire.org Git - ipfire.org.git/commitdiff
Merge commit 'earl/next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 29 Jan 2010 16:34:55 +0000 (17:34 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 29 Jan 2010 16:34:55 +0000 (17:34 +0100)

Trivial merge