From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 26 Jan 2012 16:46:56 +0000 (+0100)
Subject: Merge branch 'master' into core56
X-Git-Tag: v2.11-core56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5db3741f3721d32fe4eacac0c0bacf981fbfedc8;p=ipfire-2.x.git

Merge branch 'master' into core56
---

5db3741f3721d32fe4eacac0c0bacf981fbfedc8