]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 5 Dec 2005 20:19:43 +0000 (15:19 -0500)
committerHarlan Stenn <stenn@ntp.org>
Mon, 5 Dec 2005 20:19:43 +0000 (15:19 -0500)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 4394a0dfY6ky1ae2ax9yQLGh-uQ8qg


Trivial merge