From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 4 Feb 2009 16:33:54 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~37
X-Git-Url: http://git.ipfire.org/?p=ipfire-3.x.git;a=commitdiff_plain;h=1498097c1ca2384dae1930ae424388b81d43edf1

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

1498097c1ca2384dae1930ae424388b81d43edf1