From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 16 Sep 2015 18:28:53 +0000 (+0200)
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=40baf261430f9398b4dd0bbbbeadf8562731e9b0;p=people%2Fms%2Fipfire-2.x.git

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

40baf261430f9398b4dd0bbbbeadf8562731e9b0