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