]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-sntp
authorDave Hart <hart@ntp.org>
Wed, 10 Nov 2010 02:54:36 +0000 (02:54 +0000)
committerDave Hart <hart@ntp.org>
Wed, 10 Nov 2010 02:54:36 +0000 (02:54 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-sntp

bk: 4cda096cn4l_hr8sA3ETCNsaGFkLvg


Trivial merge