From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 31 Dec 2011 09:33:39 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.11-core56^2~25^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4afa6ddf79e0c20bb4e844aade1d1d8eeb9896a;p=people%2Fstevee%2Fipfire-2.x.git

Merge branch 'master' into next
---

f4afa6ddf79e0c20bb4e844aade1d1d8eeb9896a