]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge max.pfcs.com:/homes/harlan/src/ntp-stable-p11
authorHarlan Stenn <stenn@ntp.org>
Sat, 3 Feb 2018 13:22:34 +0000 (05:22 -0800)
committerHarlan Stenn <stenn@ntp.org>
Sat, 3 Feb 2018 13:22:34 +0000 (05:22 -0800)
into  max.pfcs.com:/homes/harlan/src/ntp-stable-p11-3452

bk: 5a75b79amX1EI6JpJZkckOEP9IJ2kw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge