From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 2 Nov 2011 15:46:45 +0000 (+0100)
Subject: Merge branch 'next' into uap
X-Git-Tag: v2.9-core54~13^2~14^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b33e6de6f564ce0c35f9ea6affe76cabf9740ca;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' into uap
---

8b33e6de6f564ce0c35f9ea6affe76cabf9740ca