From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 3 Oct 2012 14:32:02 +0000 (+0200)
Subject: Merge branch 'next' into core63
X-Git-Tag: v2.11-core63~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d22a2dc4c49dfb68e7f171d8bd8395500292835e;p=people%2Fstevee%2Fipfire-2.x.git

Merge branch 'next' into core63
---

d22a2dc4c49dfb68e7f171d8bd8395500292835e