]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Fri, 14 Oct 2005 22:24:23 +0000 (18:24 -0400)
committerHarlan Stenn <stenn@ntp.org>
Fri, 14 Oct 2005 22:24:23 +0000 (18:24 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 43503017O_tpmx2J0HjUrjQ2bcZ2Pw


Trivial merge