From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 20 Jul 2018 08:52:50 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P12~13^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=174a8dd9462cf38192dbffd3ccff21abc6e16ca7;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-3484

bk: 5b51a2e2boy61xT5jY-pQQSmSWzZ4Q
---

174a8dd9462cf38192dbffd3ccff21abc6e16ca7