]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1618-1719
authorDave Hart <hart@ntp.org>
Wed, 15 Dec 2010 08:33:15 +0000 (08:33 +0000)
committerDave Hart <hart@ntp.org>
Wed, 15 Dec 2010 08:33:15 +0000 (08:33 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1618-1719

bk: 4d087d4bpAypSvHOJpx43WxXoq8-RQ

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge