]> git.ipfire.org Git - oddments/fireinfo.git/commitdiff
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/fireinfo
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 27 Dec 2010 17:12:44 +0000 (18:12 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 27 Dec 2010 17:12:44 +0000 (18:12 +0100)

Trivial merge