From: Michael Tremer Date: Fri, 1 Apr 2016 18:13:17 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.19-core101~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a30a2d4b758eb49940e40d90dbb96f597beaa03;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 6a30a2d4b758eb49940e40d90dbb96f597beaa03