From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 25 Mar 2009 13:16:52 +0000 (+0100)
Subject: Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5abcb60df8d524dc656104ad62c2b6dd20d3800;p=ipfire-3.x.git

Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
---

d5abcb60df8d524dc656104ad62c2b6dd20d3800