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

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

9bdc5896dd9f03327eb52be6b12403aa21eded28