]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:/usa/mayer/ntp-dev-io into whimsy.udel.edu:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 7 Jan 2004 04:06:49 +0000 (23:06 -0500)
committerHarlan Stenn <stenn@ntp.org>
Wed, 7 Jan 2004 04:06:49 +0000 (23:06 -0500)
bk: 3ffb85d9kkoLbW1x3-9id00yFdCUOg


Trivial merge