From: Dave Hart <hart@ntp.org>
Date: Sun, 17 Apr 2011 20:08:44 +0000 (+0000)
Subject: Automerge of ChangeLog got it wrong.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9c63047e15175da95bcff3b47cb7a7fcd82ea12;p=thirdparty%2Fntp.git

Automerge of ChangeLog got it wrong.

bk: 4dab48cc3sShZcGd_GrnsS44wRpE5w
---

diff --git a/ChangeLog b/ChangeLog
index 7b074e5d3b..b221f0dcfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
+* Fix leak in refclock_datum.c start failure path.
 (4.2.7p154) 2011/04/17 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1887] DNS fails on 4.2.7p153 using threads.
-* Fix leak in refclock_datum.c start failure path.
 (4.2.7p153) 2011/04/16 Released by Harlan Stenn <stenn@ntp.org>
 * A few more Coverity Scan cleanups.
 (4.2.7p152) 2011/04/15 Released by Harlan Stenn <stenn@ntp.org>