From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 20 Jan 2009 11:42:43 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5cbbacc294e640954d539e4fce948c2d9ebca9b;p=ipfire-3.x.git

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

f5cbbacc294e640954d539e4fce948c2d9ebca9b