From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 29 Nov 2008 23:47:49 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.5-beta1~249
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=d304418dba3bf9913bd615946d2352ca487aa0e9

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

d304418dba3bf9913bd615946d2352ca487aa0e9