From: Michael Tremer Date: Mon, 14 Sep 2015 22:32:51 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core94~17^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ca232eb4c2655de8ca2adacb41fdc4c8e8f60ca;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 1ca232eb4c2655de8ca2adacb41fdc4c8e8f60ca