From: Dave Hart <hart@ntp.org>
Date: Sun, 26 Apr 2009 14:10:45 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5eb30e8afd7b51606e27f550a6de50abc3b3d534;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-ac

bk: 49f46b65-nY_fovpSbCrs6uQ5JH72Q
---

5eb30e8afd7b51606e27f550a6de50abc3b3d534
diff --cc ChangeLog
index f0248668cd,f29d8999fb..e88dcc42de
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* m4/ntp_lineeditlibs.m4: fix warnings from newer Autoconf
+ (4.2.5p167) 2009/04/26 Released by Harlan Stenn <stenn@ntp.org>
  * Crypto cleanup from Dave Mills.
  (4.2.5p166) 2009/04/25 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1165] Clean up small memory leaks in the  config file parser