]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 24 Jul 2018 09:17:20 +0000 (09:17 +0000)
committerHarlan Stenn <stenn@ntp.org>
Tue, 24 Jul 2018 09:17:20 +0000 (09:17 +0000)
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p12-sec

bk: 5b56eea068S09nLvSuQHvS3ma9RMrQ


Trivial merge