From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 7 Sep 2009 10:33:07 +0000 (+0200)
Subject: Merge branch 'master' of /srv/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d99153fb0b7310abce049fe3ee5470b29875d8a;p=ipfire.org.git

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

8d99153fb0b7310abce049fe3ee5470b29875d8a