From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 4 Oct 2014 11:53:49 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e43b21264f8b0c28a9b03f8f65d46e47572df719;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next'
---

e43b21264f8b0c28a9b03f8f65d46e47572df719