From: Stefan Schantl Date: Tue, 21 Jun 2016 08:08:07 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.19-core104~57 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=59232d72251e46011b92501b7538bfe24e869ffa Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 59232d72251e46011b92501b7538bfe24e869ffa