From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Tue, 15 Mar 2011 17:28:51 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-core48~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1894c45ddc657360e9e8ad95f567f2b677c4544;p=ipfire-2.x.git

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

f1894c45ddc657360e9e8ad95f567f2b677c4544