]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1757
authorHarlan Stenn <stenn@ntp.org>
Fri, 17 Dec 2010 03:32:32 +0000 (22:32 -0500)
committerHarlan Stenn <stenn@ntp.org>
Fri, 17 Dec 2010 03:32:32 +0000 (22:32 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d0ad9d04NveEn4vGs6GUHChK_d82Q

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge