]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 9 May 2015 03:37:43 +0000 (23:37 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 9 May 2015 03:37:43 +0000 (23:37 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 554d8107FS_JcnP7NFNK7iTJ-r2cIQ

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge