]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15
authorHarlan Stenn <stenn@ntp.org>
Sun, 31 May 2020 10:00:02 +0000 (10:00 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sun, 31 May 2020 10:00:02 +0000 (10:00 +0000)
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15-sec

bk: 5ed380221r9J4oEhj13y8drVlP0lQw


Trivial merge