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

into  psp-deb1.ntp.org:/home/stenn/ntp-stable-3050

bk: 57eba1178Xv7g2tQN15FjtDfLONN0w

diff --cc ChangeLog
index b9eccabcfdaa16123a8e4b447b06fcf48ede5e6e,a220c0c9487fca714552d012a754d4b52bddb2dd..18edcb177ba163647fc410aa979b42f135fc6271
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,24 -1,7 +1,27 @@@
  ---
 +
 +* [Bug 3084] update-leap mis-parses the leapfile name.  HStenn.
 +* [Bug 3053] ntp_loopfilter.c frequency calc precedence error.  Sarah White.
+ * [Bug 3050]  Fix for bug #2960 causes [...] spurious error message.
+   <perlinger@ntp.org>
+   - patches by Reinhard Max <max@suse.com> and Havard Eidnes <he@uninett.no>
 +* [Bug 3047] Fix refclock_jjy C-DEX JST2000. abe@ntp.org
 +  - Patch provided by Kuramatsu.
 +* [Bug 3021] unity_fixture.c needs pragma weak <perlinger@ntp.org>
 +  - removed unnecessary & harmful decls of 'setUp()' & 'tearDown()'
 +* [Bug 2998] sntp/tests/packetProcessing.c broken without openssl. JPerlinger
 +* [Bug 2961] sntp/tests/packetProcessing.c assumes AUTOKEY.  HStenn.
 +* [Bug 2959] refclock_jupiter: gps week correction <perlinger@ntp.org>
 +  - fixed GPS week expansion to work based on build date. Special thanks
 +    to Craig Leres for initial patch and testing.
 +* [Bug 2951] ntpd tests fail: multiple definition of `send_via_ntp_signd'
 +  - fixed Makefile.am <perlinger@ntp.org>
 +* [Bug 2689] ATOM driver processes last PPS pulse at startup,
 +             even if it is very old <perlinger@ntp.org>
 +  - make sure PPS source is alive before processing samples
 +  - improve stability close to the 500ms phase jump (phase gate)
 +* git author attribution cleanup
 +* bk ignore file cleanup
  
  ---
  (4.2.8p8) 2016/06/02 Released by Harlan Stenn <stenn@ntp.org>