]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge http://ntp.bkbits.net/ntp-dev
authorTerje Mathisen <terje@tmsw.no>
Tue, 6 Jan 2004 20:20:22 +0000 (21:20 +0100)
committerTerje Mathisen <terje@tmsw.no>
Tue, 6 Jan 2004 20:20:22 +0000 (21:20 +0100)
into y3111429.nh.ad.hydro.com:D:/cygwin/home/a115350/ntp-dev

bk: 3ffb18865k3Ny9XPJjcUuH0es-Vc7A


Trivial merge