From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 2 Nov 2008 18:34:54 +0000 (+0100)
Subject: Merge branch 'master' of /srv/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8869fef11419762a22ab15ac2f2bc0ec8cc6eac;p=ipfire.org.git

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

e8869fef11419762a22ab15ac2f2bc0ec8cc6eac