]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 8 Nov 2005 03:32:53 +0000 (22:32 -0500)
committerHarlan Stenn <stenn@ntp.org>
Tue, 8 Nov 2005 03:32:53 +0000 (22:32 -0500)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 43701c65tXkX_l-q4SvsVPskdD_ALQ


Trivial merge