From: root <root@ikarus.homeip.net>
Date: Mon, 1 Dec 2008 22:24:51 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.5-beta1~247^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=b97ae7d966e14627aba735905c4cbdafc1ff5a93

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

b97ae7d966e14627aba735905c4cbdafc1ff5a93