From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Dec 2008 20:57:50 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~379
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e32cbfccb9ce257ea209f48d174270690c677182;p=ipfire-3.x.git

Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
---

e32cbfccb9ce257ea209f48d174270690c677182