From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 17 Aug 2011 14:54:10 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-core53~47^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5861450ef888402d3258f38861ce8f9a7a14c8e7;p=ipfire-2.x.git

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

5861450ef888402d3258f38861ce8f9a7a14c8e7