]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Fri, 23 Sep 2005 07:48:13 +0000 (03:48 -0400)
committerHarlan Stenn <stenn@ntp.org>
Fri, 23 Sep 2005 07:48:13 +0000 (03:48 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 4333b33dTknUSMvVVcZYRF_nQSn6Bw


Trivial merge