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

bk: 4cb923ffC27Xy_ZjAX9G7BhoRfmFzQ


Trivial merge