From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 21 Feb 2009 18:37:17 +0000 (+0100)
Subject: Merge branch 'master' of /srv/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aef8bc6bb3a36799828e94cd6b1a3139c2f5d048;p=ipfire.org.git

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

aef8bc6bb3a36799828e94cd6b1a3139c2f5d048