merge cleanup

bk: 5590badeKXqxAhDwCXCx5mVfwPo4GA

diff --git a/ChangeLog b/ChangeLog
index 6ed7742980dc463f86276ae90091311b0bcacedd..6894a9aceb27491d37773457f871b01cf3d6ec76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Below are from 4.2.8p3:
 * [Bug 2860] ntpq ifstats sanity check is too stringent.  Frank Kardel.
 * README.leapsmear added.  Martin Burnicki.
 * README.leapsmear edited.  Harlan Stenn.
+* tests/libntp/msyslog.c: fixed a gcc warning. Tomasz Flendrich.
 (4.3.48) 2015/06/28 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 1060] Buffer overruns in libparse/clk_rawdcf.c.  Helge Oldach.