]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Fri, 18 Nov 2005 11:48:52 +0000 (06:48 -0500)
committerHarlan Stenn <stenn@ntp.org>
Fri, 18 Nov 2005 11:48:52 +0000 (06:48 -0500)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 437dbfa40dwoaLclso1witarFnEliQ


Trivial merge