From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 1 Mar 2017 09:16:03 +0000 (+0000)
Subject: merge cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36ce9d62cc237037bd2cd70005d1b2e55bb46a64;p=thirdparty%2Fntp.git

merge cleanup

bk: 58b69153ldvEllsU94Py6PMOCbs1UA
---

diff --git a/ChangeLog b/ChangeLog
index 75e8a4913..8832557b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,7 @@
----
-* [Sec 3393] clang scan-build findings <perlinger@ntp.org>
-
 ---
 (4.2.8p10)
 
+* [Sec 3393] clang scan-build findings <perlinger@ntp.org>
 * [Sec 3389] NTP-01-016: Denial of Service via Malformed Config
   (Pentest report 01.2017) <perlinger@ntp.org>
 * [Sec 3388] NTP-01-014: Buffer Overflow in DPTS Clock