From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 25 Aug 2008 19:06:09 +0000 (+0000)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.3-beta4~58
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=6318c40b5d541583c9efd345c7bd6d8bd768bdca;hp=--cc

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

6318c40b5d541583c9efd345c7bd6d8bd768bdca