]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge stenn@psp-deb1.ntp.org:ntp-stable-p11
authorHarlan Stenn <stenn@ntp.org>
Sat, 13 Jan 2018 08:44:07 +0000 (00:44 -0800)
committerHarlan Stenn <stenn@ntp.org>
Sat, 13 Jan 2018 08:44:07 +0000 (00:44 -0800)
into  psp-at0.tal1.ntfo.org:/home/harlan/src/ntp-stable-p11

bk: 5a59c6d7RruADgLTcIcIBMl6RBKe3g

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge