From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 12 Dec 2008 15:20:12 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.5-beta1~245^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cab25d67ad7f0b0efec2332ae9dddf3c8d380e89;p=ipfire-2.x.git

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

cab25d67ad7f0b0efec2332ae9dddf3c8d380e89