]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/usa/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 29 Sep 2015 10:50:01 +0000 (06:50 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 29 Sep 2015 10:50:01 +0000 (06:50 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 560a6cd9XFDMKHiGxnml-puAhktM-w

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge