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

bk: 435007bfY2FMnq7q_ukj0DqjNOm4pw


Trivial merge