]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1932
authorHarlan Stenn <stenn@ntp.org>
Wed, 25 May 2011 19:12:04 +0000 (15:12 -0400)
committerHarlan Stenn <stenn@ntp.org>
Wed, 25 May 2011 19:12:04 +0000 (15:12 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4ddd5484s6cylob3OGQ9_j0zMl_RVg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge