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

author Harlan Stenn <stenn@ntp.org>

Mon, 22 Feb 2016 05:37:02 +0000 (05:37 +0000)

committer Harlan Stenn <stenn@ntp.org>

Mon, 22 Feb 2016 05:37:02 +0000 (05:37 +0000)
author Harlan Stenn <stenn@ntp.org>
Mon, 22 Feb 2016 05:37:02 +0000 (05:37 +0000)
committer Harlan Stenn <stenn@ntp.org>
Mon, 22 Feb 2016 05:37:02 +0000 (05:37 +0000)
diff --cc ChangeLog
Simple merge
diff --cc ntpd/ntp_control.c
Simple merge
author	Harlan Stenn <stenn@ntp.org>
	Mon, 22 Feb 2016 05:37:02 +0000 (05:37 +0000)
committer	Harlan Stenn <stenn@ntp.org>
	Mon, 22 Feb 2016 05:37:02 +0000 (05:37 +0000)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntp_control.c	patch \|	diff1 \|	diff2 \|	blob \| history