From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 24 Jan 2018 07:03:47 +0000 (-0800)
Subject: Merge stenn@psp-deb1.ntp.org:ntp-stable-p11
X-Git-Tag: NTP_4_2_8P11~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afdf123a5643dee48eb876b253ab3878f842518a;p=thirdparty%2Fntp.git

Merge stenn@psp-deb1.ntp.org:ntp-stable-p11
into  psp-at0.tal1.ntfo.org:/home/harlan/src/ntp-stable-p11

bk: 5a682fd3MZG1nqtJHgKybaxTmjycgg
---

afdf123a5643dee48eb876b253ab3878f842518a