From: Michael Tremer Date: Mon, 27 Dec 2010 17:12:44 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/fireinfo X-Git-Tag: v2.0.0~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1158238b1dd665fbef1e6c65257964d15fa3664c;p=oddments%2Ffireinfo.git Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/fireinfo --- 1158238b1dd665fbef1e6c65257964d15fa3664c