From: Dave Hart <hart@ntp.org>
Date: Sat, 16 Oct 2010 04:03:11 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1584
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9dd88bec87bf0c59ea8d47a057f77bb8971d6ea5;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1584
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1584

bk: 4cb923ffC27Xy_ZjAX9G7BhoRfmFzQ
---

9dd88bec87bf0c59ea8d47a057f77bb8971d6ea5