]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 21 Dec 2005 03:20:53 +0000 (22:20 -0500)
committerHarlan Stenn <stenn@ntp.org>
Wed, 21 Dec 2005 03:20:53 +0000 (22:20 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 43a8ca15QoUkE9nErLzy2lIsjFMSfg


Trivial merge