From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 7 Apr 2012 09:42:17 +0000 (+0200)
Subject: Merge commit 'origin/master' into core58
X-Git-Tag: v2.11-core61~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fcore58;p=ipfire-2.x.git

Merge commit 'origin/master' into core58
---

6325b06b17d6033afa42b4139192c48974e63a75