]> 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>
Fri, 2 Jan 2004 21:35:50 +0000 (16:35 -0500)
committerHarlan Stenn <stenn@ntp.org>
Fri, 2 Jan 2004 21:35:50 +0000 (16:35 -0500)
bk: 3ff5e436baeLGe1HRujCj5Ocy43LNw


Trivial merge