merge cleanup

bk: 5573fcc3GKoLtsfOGf3KBzwD2d8yow

diff --git a/ChangeLog b/ChangeLog
index 587314ff6f99ad6667a84bf07fde146c602ca39b..e1135e9b6df9bedfd71b6bfb591849e96b068ff9 100644 (file)
--- 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