From: Maniacikarus <maniacikarus@ipfire.org>
Date: Mon, 20 Oct 2008 14:54:30 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.3-rc1~18^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=598eb0cd9f356dc5e3699f71fe46769a2452d2c4;p=ipfire-2.x.git

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

598eb0cd9f356dc5e3699f71fe46769a2452d2c4