]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/home/bk/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 23 Jan 2006 06:08:25 +0000 (01:08 -0500)
committerHarlan Stenn <stenn@ntp.org>
Mon, 23 Jan 2006 06:08:25 +0000 (01:08 -0500)
into  pogo.udel.edu:/pogo/users/kardel/main-line/ntp-dev

bk: 43d472d9OPa9VfofqMAbzicMx9sAzA


Trivial merge