]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:/usa/hart/ntp-dev-1478-79-84
authorHarlan Stenn <stenn@ntp.org>
Tue, 9 Feb 2010 08:27:12 +0000 (03:27 -0500)
committerHarlan Stenn <stenn@ntp.org>
Tue, 9 Feb 2010 08:27:12 +0000 (03:27 -0500)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4b711c60tPoPY-t9x3saQYG5vEHC7A

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge