From: Maniacikarus <maniacikarus@ipfire.org>
Date: Sun, 28 Sep 2008 15:56:28 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.3-beta4~14^2~13^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae34b29cadde690d3e61edbab4b2dce0b9462235;p=ipfire-2.x.git

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

ae34b29cadde690d3e61edbab4b2dce0b9462235