From: Maniacikarus <maniacikarus@ipfire.org>
Date: Fri, 12 Dec 2008 22:49:36 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.5-beta1~245^2~3^2~3^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=46c78ea98bdbeb03ca9c0c1ead293b974e897abb

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

46c78ea98bdbeb03ca9c0c1ead293b974e897abb