From: maniacikarus <maniacikarus@ipfire.org>
Date: Thu, 2 Apr 2009 16:33:17 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.5-beta1~59
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=bcba8f971c258423ca41ebfa17fe73c8f0919836

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

bcba8f971c258423ca41ebfa17fe73c8f0919836