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

author Harlan Stenn <stenn@ntp.org>

Wed, 25 Jul 2018 10:00:58 +0000 (10:00 +0000)

committer Harlan Stenn <stenn@ntp.org>

Wed, 25 Jul 2018 10:00:58 +0000 (10:00 +0000)
author Harlan Stenn <stenn@ntp.org>
Wed, 25 Jul 2018 10:00:58 +0000 (10:00 +0000)
committer Harlan Stenn <stenn@ntp.org>
Wed, 25 Jul 2018 10:00:58 +0000 (10:00 +0000)
diff --cc ChangeLog
Simple merge
diff --cc NEWS
Simple merge
author	Harlan Stenn <stenn@ntp.org>
	Wed, 25 Jul 2018 10:00:58 +0000 (10:00 +0000)
committer	Harlan Stenn <stenn@ntp.org>
	Wed, 25 Jul 2018 10:00:58 +0000 (10:00 +0000)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history