From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 24 Jan 2012 19:53:06 +0000 (+0100)
Subject: Merge commit 'origin/next'
X-Git-Tag: v2.11-core56^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ccf0a2b880095fddc42c609ab05f67e3141bc75;p=ipfire-2.x.git

Merge commit 'origin/next'
---

1ccf0a2b880095fddc42c609ab05f67e3141bc75