From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 25 Dec 2008 18:52:17 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~328
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caa7d0547e1ce4e15391701e0c899006291b1578;p=ipfire-3.x.git

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

caa7d0547e1ce4e15391701e0c899006291b1578