]> 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>
Sun, 21 Nov 2010 21:11:41 +0000 (22:11 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Nov 2010 21:11:41 +0000 (22:11 +0100)

Trivial merge