From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 26 Jul 2010 16:04:17 +0000 (+0200)
Subject: Merge branch 'master' of /srv/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=854f80c148ea121aaae28b85f25a58b525f76845;p=ipfire.org.git

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

854f80c148ea121aaae28b85f25a58b525f76845