From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 31 Dec 2017 05:48:36 +0000 (-0800)
Subject: Merge psp-at0.tal1.ntfo.org:/home/harlan/src/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec84cb21ba2db742098acc6b503d0a2e6eb9149b;p=thirdparty%2Fntp.git

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

bk: 5a487a34oCdMgh_c8iFR4HYer-8M2g
---

ec84cb21ba2db742098acc6b503d0a2e6eb9149b