From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 30 Dec 2017 11:57:07 +0000 (-0800)
Subject: Merge stenn@psp-deb1.ntp.org:ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e8680a223e400822da6ea71aadae6dffd39e8d2;p=thirdparty%2Fntp.git

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

bk: 5a477f134TiXOiKfmrrlZ23mXs2jvw
---

7e8680a223e400822da6ea71aadae6dffd39e8d2