]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 4 Jul 2006 01:16:58 +0000 (01:16 +0000)
committerHarlan Stenn <stenn@ntp.org>
Tue, 4 Jul 2006 01:16:58 +0000 (01:16 +0000)
into  ntp1.isc.org:/hog0/users/stenn/ntp-dev

bk: 44a9c18aVLqi-iDPHXAQHhs18oyqyA


Trivial merge