From: Michael Tremer Date: Thu, 15 Oct 2015 10:59:44 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core95~59 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=a18b5b4f4d383aaf132ff9e10fd3c9345d74d933 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- a18b5b4f4d383aaf132ff9e10fd3c9345d74d933