]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:/usa/mayer/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 30 Nov 2004 03:49:41 +0000 (22:49 -0500)
committerHarlan Stenn <stenn@ntp.org>
Tue, 30 Nov 2004 03:49:41 +0000 (22:49 -0500)
into whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 41abedd54b9MMtJLYAiOOnjNyQ9mag


Trivial merge