From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 30 May 2011 20:19:11 +0000 (-0400)
Subject: Merge psp-deb1.ntp.org:ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5f1df72b236131a34388fbc85df8bf57a953f6c;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:ntp-dev
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4de3fbbfybo_U4Zonf7Hz6yCkDNONg
---

c5f1df72b236131a34388fbc85df8bf57a953f6c
diff --cc ChangeLog
index 34c12cfc6f,7e7b91b701..6336296392
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,7 @@@
+ (4.2.7p175) 2011/05/30 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1936] Correctly set IPV6_MULTICAST_LOOP.
  * cmd-doc.tlib cleanup from Bruce Korb.
 +* sntp documentation cleanup.
  (4.2.7p174) 2011/05/28 Released by Harlan Stenn <stenn@ntp.org>
  * ntpdc documentation cleanup.
  * sntp documentation cleanup.