]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 4 Jul 2006 22:10:01 +0000 (18:10 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 4 Jul 2006 22:10:01 +0000 (18:10 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-stable

bk: 44aae739HfDPm-Zq2Ty168KGiyHmOA


Trivial merge