From: root <root@uhweb28124.united-hoster.com>
Date: Wed, 2 Jul 2008 18:15:13 +0000 (+0200)
Subject: Merge branch 'master' of /srv/git/ipfire.org
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=974b01292796677fcfc9d0b2c8e52d26197070de;p=ipfire.org.git

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

974b01292796677fcfc9d0b2c8e52d26197070de