Merge cleanup

bk: 554d77d9tVdtVbxHDMuuqS93I75DfA

diff --git a/ChangeLog b/ChangeLog
index 4866cecc212bcbc2f33fed6a8d91628a9ce3ab71..eef361f776570fe6084dd02a0b8b7f593fb545a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Below are from 4.2.8p3:
+* [Bug 2808] GPSD_JSON driver enhancements, step 1.
+  Increase internal token buffer to parse all JSON data, even SKY.
 (4.3.31) 2015/05/08 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * CID 739725: Fix a rare resource leak in libevent/listener.c.