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

author Harlan Stenn <stenn@ntp.org>

Fri, 20 Jul 2018 08:52:50 +0000 (08:52 +0000)

committer Harlan Stenn <stenn@ntp.org>

Fri, 20 Jul 2018 08:52:50 +0000 (08:52 +0000)
author Harlan Stenn <stenn@ntp.org>
Fri, 20 Jul 2018 08:52:50 +0000 (08:52 +0000)
committer Harlan Stenn <stenn@ntp.org>
Fri, 20 Jul 2018 08:52:50 +0000 (08:52 +0000)
diff --cc ChangeLog
Simple merge
diff --cc ntpq/ntpq.c
Simple merge
author	Harlan Stenn <stenn@ntp.org>
	Fri, 20 Jul 2018 08:52:50 +0000 (08:52 +0000)
committer	Harlan Stenn <stenn@ntp.org>
	Fri, 20 Jul 2018 08:52:50 +0000 (08:52 +0000)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
ntpq/ntpq.c	patch \|	diff1 \|	diff2 \|	blob \| history