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

bk: 4394c387m8QzD62G1V9F-x-f_EUXCg


Trivial merge