From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Nov 2008 21:03:02 +0000 (+0100)
Subject: Merge branch 'master' of /srv/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ad6703ee8d15cff0c86eace3dbfed64638ed555;p=ipfire.org.git

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

5ad6703ee8d15cff0c86eace3dbfed64638ed555