]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1732
authorDave Hart <hart@ntp.org>
Mon, 28 Mar 2011 14:10:16 +0000 (14:10 +0000)
committerDave Hart <hart@ntp.org>
Mon, 28 Mar 2011 14:10:16 +0000 (14:10 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1861

bk: 4d9096c8DGmARZ_8lG5HLdAaQyX75A

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge