]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1978
authorDave Hart <hart@ntp.org>
Wed, 27 Jul 2011 22:23:06 +0000 (22:23 +0000)
committerDave Hart <hart@ntp.org>
Wed, 27 Jul 2011 22:23:06 +0000 (22:23 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1976

bk: 4e308fca_8zzVs5gtiTrcLBkF-n52A

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge