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

bk: 44ee3c2aEWvk7refJ7u_OejiPGdZhQ


Trivial merge