]> 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 01:58:12 +0000 (21:58 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 20 Jul 2006 01:58:12 +0000 (21:58 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 44bee334fEIFBIsAP_k5v1o4DK175A


Trivial merge