From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 5 Aug 2008 16:27:08 +0000 (+0200)
Subject: Merge branch 'master' of /srv/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7efc4422393ec10c44b8133a279ca11e68a13ea;p=ipfire.org.git

Merge branch 'master' of /srv/git/ipfire.org
---

d7efc4422393ec10c44b8133a279ca11e68a13ea