From: Dave Hart <hart@ntp.org>
Date: Sat, 4 Dec 2010 09:01:21 +0000 (+0000)
Subject: Merge bk://bk2.ntp.org./ntp-dev
X-Git-Tag: NTP_4_2_7P89~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=111560ef9c5c97a1b62010964a20ba17ef9a75a5;p=thirdparty%2Fntp.git

Merge bk://bk2.ntp.org./ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1736

bk: 4cfa036151Yz2GwqGnsEExjoFs4AEw
---

111560ef9c5c97a1b62010964a20ba17ef9a75a5
diff --cc ChangeLog
index f61bcae78,779ec1639..26064b871
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,6 @@@
- * [Bug 1735] clocktime() aborts ntpd on bogus input.
 +* [Bug 1736] tos int, bool options broken in 4.2.7p66.
+ (4.2.7p88) 2010/12/02 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1735] 'clocktime()' aborts ntpd on bogus input
  (4.2.7p87) 2010/12/01 Released by Harlan Stenn <stenn@ntp.org>
  * from 4.2.6p3-RC12: Clean up m4 quoting in configure.ac, *.m4 files,
    resolving intermittent AC_LANG_PROGRAM possibly undefined errors.