From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 27 Dec 2008 23:36:52 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~301^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7bfd2a0529efacef0656aa01cd7262c9ec98eee3;p=ipfire-3.x.git

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

7bfd2a0529efacef0656aa01cd7262c9ec98eee3