]> 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>
Sun, 15 Oct 2017 07:31:55 +0000 (07:31 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sun, 15 Oct 2017 07:31:55 +0000 (07:31 +0000)
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p11

bk: 59e30eebA-FT34vkIBPQn5GAHS_yVw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge