]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 11 Jan 2005 05:24:48 +0000 (00:24 -0500)
committerHarlan Stenn <stenn@ntp.org>
Tue, 11 Jan 2005 05:24:48 +0000 (00:24 -0500)
into pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag

bk: 41e36320632hKMS52FZNpuzDPT0TkA


Trivial merge