From: Michael Tremer Date: Sun, 21 Nov 2010 21:11:41 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/fireinfo X-Git-Tag: v0.2~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7408fc5b5105e086f191f9af41b9ad4f970b2de8;p=oddments%2Ffireinfo.git Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/fireinfo --- 7408fc5b5105e086f191f9af41b9ad4f970b2de8