]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 13 Jun 2018 05:11:08 +0000 (05:11 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 13 Jun 2018 05:11:08 +0000 (05:11 +0000)
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3486

bk: 5b20a76cHoZkfPBsbbrOQJLiwWSMaQ

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge