Merge ssh://perlinger@psp-deb1.ntp.org//home/stenn/ntp-stable

into  ntp.org:/home/jnperlin/Projects/NTP-DEV/src/ntp-stable-zeller

bk: 5e22a1b84ZFo63r8APksRitY1YTP8Q

diff --cc ChangeLog
index 7265ea04bbbe9315fee3e11624e27f3b2fa50246,f3816a92d6beedfcf9c73bea893343970bf1c6d7..0f22f053d8c429984439bea30ffdd10303f6f478
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -2,9 -2,7 +2,10 @@@
  
  * [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 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>