]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sun, 16 Oct 2005 00:44:48 +0000 (20:44 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 16 Oct 2005 00:44:48 +0000 (20:44 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 4351a280MpR-4mSPKMawJlGtAoIwYQ


Trivial merge