]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Fri, 24 Feb 2006 09:31:16 +0000 (04:31 -0500)
committerHarlan Stenn <stenn@ntp.org>
Fri, 24 Feb 2006 09:31:16 +0000 (04:31 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 43fed26490xXMwnbPetZacTtKovLvQ


Trivial merge