]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/ntp-dev
authorFrank Kardel <kardel@ntp.org>
Sat, 8 Jul 2006 11:25:26 +0000 (11:25 +0000)
committerFrank Kardel <kardel@ntp.org>
Sat, 8 Jul 2006 11:25:26 +0000 (11:25 +0000)
into  pogo.udel.edu:/pogo/users/kardel/main-line/ntp-dev

bk: 44af9626tXGTmLojYx16TRtWvaBRiA


Trivial merge