From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 13 Oct 2008 16:22:06 +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=54e70d9c5213195b936d2fa7f93bf3dfa0173f3a;p=ipfire.org.git

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

Conflicts:

	www/de/downloads.shtml
	www/en/downloads.shtml

nothing added to commit but untracked files present (use "git add" to track)
---

54e70d9c5213195b936d2fa7f93bf3dfa0173f3a