Merge bk://bk.ntp.org/ntp-stable

author Harlan Stenn <stenn@ntp.org>

Sun, 14 Jun 2015 03:03:56 +0000 (03:03 +0000)

committer Harlan Stenn <stenn@ntp.org>

Sun, 14 Jun 2015 03:03:56 +0000 (03:03 +0000)
author Harlan Stenn <stenn@ntp.org>
Sun, 14 Jun 2015 03:03:56 +0000 (03:03 +0000)
committer Harlan Stenn <stenn@ntp.org>
Sun, 14 Jun 2015 03:03:56 +0000 (03:03 +0000)
diff --cc ChangeLog
Simple merge
diff --cc ntpd/ntp_io.c
Simple merge
author	Harlan Stenn <stenn@ntp.org>
	Sun, 14 Jun 2015 03:03:56 +0000 (03:03 +0000)
committer	Harlan Stenn <stenn@ntp.org>
	Sun, 14 Jun 2015 03:03:56 +0000 (03:03 +0000)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntp_io.c	patch \|	diff1 \|	diff2 \|	blob \| history