]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 27 Jun 2007 06:25:24 +0000 (02:25 -0400)
committerHarlan Stenn <stenn@ntp.org>
Wed, 27 Jun 2007 06:25:24 +0000 (02:25 -0400)
into  pogo.udel.edu:/pogo/users/mayer/ntp-dev

bk: 468202d4l7mOdVsCM2vNsjytUOk5-A

1  2 
ChangeLog
NEWS

diff --cc ChangeLog
Simple merge
diff --cc NEWS
Simple merge