merge cleanup

bk: 55bc8bedUW8lHaEFu4O5YgLab0ZHNw

diff --git a/ChangeLog b/ChangeLog
index 162c28f7aa811ab919a870a2a9922caffedf3b30..cac406ecf1c2899c663c646e06cf42744a794288 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p4:
+* [Bug 2821] minor build issues: fixed refclock_gpsdjson.c.  perlinger@ntp.org
 (4.3.68) 2015/07/31 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * [Bug 2890] Ignore ENOBUFS on routing netlink socket.  Konstantin Khlebnikov.