]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1429
authorDave Hart <hart@ntp.org>
Wed, 23 Dec 2009 11:35:25 +0000 (11:35 +0000)
committerDave Hart <hart@ntp.org>
Wed, 23 Dec 2009 11:35:25 +0000 (11:35 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1429

bk: 4b32007dIOUr-nyefLb9q4Oc7BiZuw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge