]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 26 Sep 2005 06:21:59 +0000 (02:21 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 26 Sep 2005 06:21:59 +0000 (02:21 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 43379387-CmEQHlEWeoG9VCkaUa3Zw


Trivial merge