]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:/usa/mayer/ntp-dev into whimsy.udel.edu:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sun, 3 Apr 2005 00:07:13 +0000 (19:07 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sun, 3 Apr 2005 00:07:13 +0000 (19:07 -0500)
bk: 424f33b1hwyLWA9wF2Z9wJkB0n5Fqw


Trivial merge