From: root <root@uhweb28125.united-hoster.com>
Date: Thu, 18 Jun 2009 02:02:09 +0000 (+0200)
Subject: Merge branch 'master' of /srv/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db6ce1ae402fb17aa2ddccf745948cea6cb685c8;p=ipfire.org.git

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

db6ce1ae402fb17aa2ddccf745948cea6cb685c8