From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 11 Jul 2015 23:22:45 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_3_58~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7057b957ca1892d3eb44a43bc3532119fe18d99d;p=thirdparty%2Fntp.git

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

bk: 55a1a5454phQzgIENSKe0teOGIlYFQ
---

7057b957ca1892d3eb44a43bc3532119fe18d99d