]> 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>
Thu, 8 Jan 2004 21:54:43 +0000 (16:54 -0500)
committerHarlan Stenn <stenn@ntp.org>
Thu, 8 Jan 2004 21:54:43 +0000 (16:54 -0500)
bk: 3ffdd1a3esXCtOdn7hy96C_umIxdog


Trivial merge