From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Sat, 24 May 2008 11:12:46 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.3-beta1~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07bfc29212778c7feaa338a358bfd3b195995af4;p=ipfire-2.x.git

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

07bfc29212778c7feaa338a358bfd3b195995af4