From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Jan 2009 17:44:06 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ed9c0d249850fec2e0e770d7ccb4307673cc130;p=ipfire-3.x.git

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

1ed9c0d249850fec2e0e770d7ccb4307673cc130