]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1584
authorDave Hart <hart@ntp.org>
Thu, 14 Oct 2010 14:49:07 +0000 (14:49 +0000)
committerDave Hart <hart@ntp.org>
Thu, 14 Oct 2010 14:49:07 +0000 (14:49 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1584

bk: 4cb71863LWiQFvfJ5CgdvbTPO_laYQ


Trivial merge