From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 2 Dec 2008 20:01:48 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.5-beta1~247
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=05fa01ffb75e2dea21985a870940a09015753095

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

05fa01ffb75e2dea21985a870940a09015753095