From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 2 Oct 2008 16:34:27 +0000 (+0000)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.3-beta4~12
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=fc81d17c067ab2b82ea384056805f5c09f761423

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

fc81d17c067ab2b82ea384056805f5c09f761423