From: Jan Paul Tuecking <earl@ipfire.org>
Date: Thu, 2 Jul 2009 17:26:26 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.5-core29~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a2875a46a9015814db8ab2ce372fc7d13c09bc1;p=ipfire-2.x.git

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

2a2875a46a9015814db8ab2ce372fc7d13c09bc1