]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://ntp.bkbits.com/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 17 Jun 2006 02:34:33 +0000 (02:34 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sat, 17 Jun 2006 02:34:33 +0000 (02:34 +0000)
into  ntp1.isc.org:/hog0/users/stenn/ntp-dev

bk: 44936a391GJ3BzxvYj7SwqmWgEKiaQ


Trivial merge