From: Dave Hart <hart@ntp.org>
Date: Wed, 30 Sep 2009 06:36:32 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P225~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b7bdccf4a2b25e0cfaf3187bb599a2df7406283;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1324

bk: 4ac2fc70un0YpTopVuBxgm86-gHDtg
---

3b7bdccf4a2b25e0cfaf3187bb599a2df7406283
diff --cc ChangeLog
index e70f08a5b,0e4ca4848..2d8daf07c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* authopt documentation changes from Dave Mills/Dave Hart.
+ * [Bug 1324] support bracketed IPv6 numeric addresses for restrict.
  (4.2.5p224) 2009/09/29 Released by Harlan Stenn <stenn@ntp.org>
  * Clockhop and documentation fixes from Dave Mills.
  * Remove "tos maxhop" ntp.conf knob.