]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Thu, 13 Oct 2005 05:15:25 +0000 (01:15 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 13 Oct 2005 05:15:25 +0000 (01:15 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 434ded6dLsZOBlONFzlRcDMQYdWdjw


Trivial merge