From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Sep 2008 18:53:30 +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=d679a1a44840efc62a5818ad5093184670094796;p=ipfire.org.git

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

Conflicts:

	www/en/index.shtml
	www/en/news.shtml
---

d679a1a44840efc62a5818ad5093184670094796