From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 31 Dec 2017 07:49:23 +0000 (-0800)
Subject: Merge stenn@psp-deb1.ntp.org:ntp-stable-p11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76573bbe2739f16e15601dd83bee8450e840c545;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: 5a489683POGcs7jzP2FMOj9u-zUZhQ
---

76573bbe2739f16e15601dd83bee8450e840c545