]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Fri, 25 Dec 2009 06:09:56 +0000 (01:09 -0500)
committerHarlan Stenn <stenn@ntp.org>
Fri, 25 Dec 2009 06:09:56 +0000 (01:09 -0500)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4b345734C-jlBJAG6-JPxDkXnk82fQ

1  2 
ChangeLog
configure.ac

diff --cc ChangeLog
Simple merge
diff --cc configure.ac
Simple merge