From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 31 May 2020 10:00:02 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39c5eec103a86119f13441cc7a9fad2d1a7d4192;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15-sec

bk: 5ed380221r9J4oEhj13y8drVlP0lQw
---

39c5eec103a86119f13441cc7a9fad2d1a7d4192