]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:/usa/mayer/ntp-dev into whimsy.udel.edu:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 2 Apr 2005 23:53:23 +0000 (18:53 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sat, 2 Apr 2005 23:53:23 +0000 (18:53 -0500)
bk: 424f3073sKtE2XKYp4CAHRoBVaKPwg


Trivial merge