From: Michael Tremer Date: Thu, 29 Oct 2015 23:25:45 +0000 (+0000) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core95~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c98981ae3d23db0270f43ed4647cfc10ad89b697;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- c98981ae3d23db0270f43ed4647cfc10ad89b697