]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag
authorHarlan Stenn <stenn@ntp.org>
Thu, 12 Jan 2006 09:37:48 +0000 (04:37 -0500)
committerHarlan Stenn <stenn@ntp.org>
Thu, 12 Jan 2006 09:37:48 +0000 (04:37 -0500)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag-test

bk: 43c6236c6D72jgxOHvoE1hSSULs7iQ

1  2 
bootstrap

diff --cc bootstrap
Simple merge