From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 13 Jun 2015 09:30:41 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_3_40~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d59d93fdafb1ee0af9f80f881979ade77b0c147b;p=thirdparty%2Fntp.git

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

bk: 557bf841XKFkq8xBqQH2Zr65j8VXvA
---

d59d93fdafb1ee0af9f80f881979ade77b0c147b