From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 21 Dec 2008 19:16:15 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~360
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=314fbdb74e3c38e2fc0fde5298020809485b8fb0;p=ipfire-3.x.git

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

314fbdb74e3c38e2fc0fde5298020809485b8fb0