]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/home/bk/ntp-dev
authorDanny Mayer <mayer@ntp.org>
Wed, 9 Nov 2005 20:49:56 +0000 (15:49 -0500)
committerDanny Mayer <mayer@ntp.org>
Wed, 9 Nov 2005 20:49:56 +0000 (15:49 -0500)
into  pogo.udel.edu:/pogo/users/mayer/ntp-dev

bk: 437260f4wXl7f5mZRDVlNKyFpHTndw


Trivial merge