From: Michael Tremer Date: Sat, 7 May 2016 11:32:27 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.19-core103~48^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb196971e9bac3b8055547f8273e4bad786f896d;p=people%2Fstevee%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- fb196971e9bac3b8055547f8273e4bad786f896d