From: Harlan Stenn Date: Tue, 24 Jul 2018 09:17:20 +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=59c781f2f8eadd9685de27dd0418cea37849611c;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: 5b56eea068S09nLvSuQHvS3ma9RMrQ --- 59c781f2f8eadd9685de27dd0418cea37849611c