]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge stenn@pogo.udel.edu:ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 28 May 2005 08:58:17 +0000 (03:58 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sat, 28 May 2005 08:58:17 +0000 (03:58 -0500)
into poog.il.thewrittenword.com:/home/stenn/ntp-dev

bk: 429832a9nVvL2ofuJQpEs5KHVljEBg


Trivial merge