From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 14 Jul 2008 09:33:19 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~865^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=856e34099bc407c902d7cdbe6adc0e58b52e478a;p=ipfire-3.x.git

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

856e34099bc407c902d7cdbe6adc0e58b52e478a