Merge ntp-stage.tal1.ntfo.org:/ntpstage/data/incoming/ntp-stable

into  ntp-stage.tal1.ntfo.org:/ntpstage/data/incoming/ntp-stable-3053

bk: 69009981BPfpA9IUq5iIcris4m6QVQ

diff --cc ChangeLog
index aa3b904e290e08a05ed94b0c18afab10ec29aee1,07d0753a935e13c9c84f2b68e60f46e3582960fd..ff99c377720250c01e3b8274076fbca08ddbfe59
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,8 @@@
  ---
  * [Bug 3960] Remove duplicate ntp.conf.def content, reported by
               Ulrich Windl. <stenn@ntp.org>
+ * [Bug 3053] Frequency prediction algorithm precedence error. <hart@ntp.org>
 +* Update the copyright year.  <stenn@ntp.org>
  * Makefile.am: Another tweak to check-local.  <stenn@ntp.org>
  * cleanup github-specific files.  <stenn@ntp.org>
  * Add COPYRIGHT.md and LICENSE.md.  <stenn@ntp.org>