From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 7 Oct 2014 16:37:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=215043936ebd50c4331ca6d9600dc7e93acd1bb4;p=people%2Fms%2Fipfire-2.x.git

Merge remote-tracking branch 'origin/next'
---

215043936ebd50c4331ca6d9600dc7e93acd1bb4