]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 24 Jun 2006 23:47:42 +0000 (19:47 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 24 Jun 2006 23:47:42 +0000 (19:47 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-stable

bk: 449dcf1e5_7G85KbQnLHcPw_y4lcZA


Trivial merge