From: Michael Tremer Date: Sat, 31 Oct 2015 21:44:51 +0000 (+0000) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core95~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=843ca290e1be08ddf614cb087b7ddc24d1dada1c;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 843ca290e1be08ddf614cb087b7ddc24d1dada1c