]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 9 Nov 2010 23:25:30 +0000 (18:25 -0500)
committerHarlan Stenn <stenn@ntp.org>
Tue, 9 Nov 2010 23:25:30 +0000 (18:25 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4cd9d86aA2wkLgQiiVna5XIwzCuCCw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge