From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 22 Aug 2008 10:14:53 +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=88ff9087388af9981df22f0751c97a90322c6453;p=ipfire.org.git

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

88ff9087388af9981df22f0751c97a90322c6453