From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 30 Sep 2008 10:24:18 +0000 (+0000)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.3-beta4~14
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=824a0f689e6269c178e54feeaba878078bb6a49b

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

824a0f689e6269c178e54feeaba878078bb6a49b