From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 13 Jun 2018 05:11:08 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P12~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2521a927279a258d9d8bc9504c3a33b8f0e7a37f;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3486

bk: 5b20a76cHoZkfPBsbbrOQJLiwWSMaQ
---

2521a927279a258d9d8bc9504c3a33b8f0e7a37f