From: root <root@uhweb28124.united-hoster.com>
Date: Wed, 16 Jul 2008 14:50:23 +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=34d089432b2558ba83ef2b3b838de4d836a642a9;p=ipfire.org.git

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

34d089432b2558ba83ef2b3b838de4d836a642a9