]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 20 Jul 2006 23:34:25 +0000 (19:34 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 20 Jul 2006 23:34:25 +0000 (19:34 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 44c01301bscg80GHkCmWIF9S5flxRQ


Trivial merge