From: Dave Hart <hart@ntp.org>
Date: Wed, 28 Jul 2010 07:50:15 +0000 (+0000)
Subject: Merge bk://bk.ntp.org./ntp-dev
X-Git-Tag: NTP_4_2_7P42~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12518c8b4e78b638aa9cafa2dea9c37acd95087a;p=thirdparty%2Fntp.git

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

bk: 4c4fe137Wic9QwbOKo0SjU0GBaNBXQ
---

12518c8b4e78b638aa9cafa2dea9c37acd95087a
diff --cc ChangeLog
index fd88a307e,3306008aa..49ac8f7d1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 1593] ntpd abort in free() with logconfig syntax error.
+ (4.2.7p41) 2010/07/28 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1581] from 4.2.6p3-beta1: ntp_intres.c size_t printf format
    string mismatch.
  * [Bug 1586] ntpd 4.2.7p40 doesn't write to syslog after fork on QNX.