From: Dave Hart <hart@ntp.org>
Date: Mon, 12 Apr 2010 06:18:32 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-pool-doc
X-Git-Tag: NTP_4_2_7P24~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70a28ae0fb36db9d33c42763cc09fb93b77e8dbc;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-pool-doc
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1518-20-22

bk: 4bc2bb38AmQXsZBv9O_gUPpXV_sSxA
---

70a28ae0fb36db9d33c42763cc09fb93b77e8dbc