]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/home/bk/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Thu, 26 Jan 2006 11:16:21 +0000 (11:16 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 26 Jan 2006 11:16:21 +0000 (11:16 +0000)
into  ntp1.isc.org:/hog0/users/stenn/ntp-dev

bk: 43d8af85aftTJUXai9w8C-dq4oyAFA


Trivial merge