]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 27 Jul 2015 02:39:09 +0000 (22:39 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 27 Jul 2015 02:39:09 +0000 (22:39 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 55b599cdGKM2NAvqLaIKEg_Qf0fXKg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge