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

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

14f7d1222e8ac09beaa784a5bea743ff361eaa33