From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Nov 2008 22:51:01 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.5-beta1~251
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=0c74362ec6004a33b44e502ff936757b2f688c3b

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

0c74362ec6004a33b44e502ff936757b2f688c3b