From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 9 May 2015 02:58:33 +0000 (-0400)
Subject: Merge cleanup
X-Git-Tag: NTP_4_3_32~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fc8117b6337d7df777c7a9993ebf1e67a6f8c34;p=thirdparty%2Fntp.git

Merge cleanup

bk: 554d77d9tVdtVbxHDMuuqS93I75DfA
---

diff --git a/ChangeLog b/ChangeLog
index 4866cecc2..eef361f77 100644
--- 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.