From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 4 Dec 2015 11:39:30 +0000 (-0500)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_3_86~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6082deb1276d7ba85e65af6be0fc0b754edd6ec9;p=thirdparty%2Fntp.git

Merge deacon.udel.edu:/deacon/backroom/ntp-stable
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 56617b72n6xUh-4vLBH6_jecDGvDrA
---

6082deb1276d7ba85e65af6be0fc0b754edd6ec9