From: Dave Hart <hart@ntp.org>
Date: Sun, 27 Dec 2009 17:37:15 +0000 (+0000)
Subject: correct ChangeLog merge from -stable
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47d6b0c7aed76a9fd7635504a08101e45e0d8a3d;p=thirdparty%2Fntp.git

correct ChangeLog merge from -stable

bk: 4b379b4bpH61UzdxBw6ogNgvOmxy0w
---

diff --git a/ChangeLog b/ChangeLog
index 1290717144..c2901bf4f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 * Include (4.2.6p1-RC3) - [Bug 1127] Check the return of X590_verify().
+* Include (4.2.6p1-RC3) - [Bug 1439] .texi gen after binary is linked.
 * Include (4.2.6p1-RC3) - [Bug 1440] Update configure.ac to support kfreebsd.
 (4.2.7p5) 2009/12/25 Released by Harlan Stenn <stenn@ntp.org>
 * Include (4.2.6p1-RC2)