From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 13 Jan 2018 08:44:07 +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=2f3adbe6b7ace68dfacbafe5c4855fd362078739;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: 5a59c6d7RruADgLTcIcIBMl6RBKe3g
---

2f3adbe6b7ace68dfacbafe5c4855fd362078739