Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3635

bk: 5e23d912FaOkJuJWIQ-iAfY2nhtQaQ

diff --cc ChangeLog
index 0f22f053d8c429984439bea30ffdd10303f6f478,6990dcfa41a4386256d60988f75a4dc715bfc3fe..9e34baec9f915cd8a12e0dae712c31a44c64b43e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -2,10 -2,8 +2,11 @@@
  
  * [Sec 3610] process_control() should bail earlier on short packets. stenn@
    - Reported by Philippe Antoine
 +* [Bug 3636] NMEA: combine time/date from multiple sentences <perlinger@ntp.org>
+ * [Bug 3635] Make leapsecond file hash check optional <perlinger@ntp.org>
  * [Bug 3634] Typo in discipline.html, reported by Jason Harrison.  stenn@
 +* [Bug 3628] raw DCF decoding - improve robustness with Zeller's congruence
 +  - implement Zeller's congruence in libparse and libntp <perlinger@ntp.org>
  * [Bug 3620] memory leak in ntpq sysinfo <perlinger@ntp.org>
    - applied patch by Gerry Garvey
  * [Bug 3619] Honour drefid setting in cooked mode and sysinfo <perlinger@ntp.org>