]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:/usa/mayer/ntp-dev into whimsy.udel.edu:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 15 Mar 2005 00:17:46 +0000 (19:17 -0500)
committerHarlan Stenn <stenn@ntp.org>
Tue, 15 Mar 2005 00:17:46 +0000 (19:17 -0500)
bk: 423629aaii11-8N044IjXkmdd4w5iw


Trivial merge