From: Michael Tremer Date: Thu, 4 Feb 2016 14:35:55 +0000 (+0000) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.19-core100~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff43197b01d45dd6119fb15586c2ce29bd4f8cb3;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- ff43197b01d45dd6119fb15586c2ce29bd4f8cb3