From: Harlan Stenn Date: Tue, 24 Jul 2018 07:42:04 +0000 (+0000) Subject: Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d234921887f075dd29381714873c2349cfce478b;p=thirdparty%2Fntp.git Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable into psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p12-sec bk: 5b56d84c_cKFGnvMfzKsHUQF_W2DWw --- d234921887f075dd29381714873c2349cfce478b