From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 5 Nov 2008 21:11:59 +0000 (+0000)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.3-final~5
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=4aefeb0c5e0aebe3ee0bf8de834ba855971814a5

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

4aefeb0c5e0aebe3ee0bf8de834ba855971814a5