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

bk: 44a89eaeJ13E7pYXCzfKRDWWO3vhRg


Trivial merge