]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 26 Aug 2001 08:43:51 +0000 (04:43 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 26 Aug 2001 08:43:51 +0000 (04:43 -0400)
into whimsy.udel.edu:/backroom/ntp-dev

bk: 3b88b6c7hryAA9p2xGkPQw8oSrmB6w


Trivial merge