From: Michael Tremer Date: Wed, 31 Aug 2016 21:40:16 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.19-core106~104 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=457367e13d23ac774ba62005e9ec6b294a935527;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 457367e13d23ac774ba62005e9ec6b294a935527