]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p10
authorHarlan Stenn <stenn@ntp.org>
Thu, 23 Mar 2017 05:46:03 +0000 (05:46 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 23 Mar 2017 05:46:03 +0000 (05:46 +0000)
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3358

bk: 58d3611bfOH6FS12RWVzLyRzl-ytzA

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge