From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 19 Mar 2015 18:19:32 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79cfa337b16e54e86b7812fb0166639759af29fe;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
---

79cfa337b16e54e86b7812fb0166639759af29fe