From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 7 Jun 2015 08:11:47 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_36~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bf9ac860c822146511c8cec52d4768e373ce2ad;p=thirdparty%2Fntp.git

merge cleanup

bk: 5573fcc3GKoLtsfOGf3KBzwD2d8yow
---

diff --git a/ChangeLog b/ChangeLog
index 587314ff6..e1135e9b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Below are from 4.2.8p3:
 * [Bug 2836] DFC77 patches from Frank Kardel to make decoding more
   robust, and require 2 consecutive timestamps to be consistent.
 * [Bug 2842] Bug in mdoc2man.
+* sntp/scripts/genLocInfo: treat raspbian as debian.
 (4.3.35) 2015/06/05 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey