Merge ntp-testbuild.tal1.ntfo.org:/home/nfs1.tal1/harlan/ntp/ntp-stable

into  ntp-testbuild.tal1.ntfo.org:/home/nfs1.tal1/harlan/ntp/ntp-stable-YYYY

bk: 67f730525QKbZ0GyyKW2vjhmW59Hww

diff --cc ChangeLog
index df15157be0458a4de3336d5caf96f17cde40d9eb,af56c9833eab44a0fb2e7addc7ba0cbdd94335ae..aa3b904e290e08a05ed94b0c18afab10ec29aee1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,10 @@@
  ---
  * [Bug 3960] Remove duplicate ntp.conf.def content, reported by
               Ulrich Windl. <stenn@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>
  * Makefile.am: Fix distcheck problem with check-local.  <stenn@ntp.org>
  * Add .github to the top-level tree. <dlavigne@nwtime.org>
  * build script: Use hostname.site for NTF build hosts.  Use the full