From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 11 Jun 2015 02:18:12 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_3_38~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12716a21f997ca036ccebf918774e779ca8bad95;p=thirdparty%2Fntp.git

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

bk: 5578efe4EIC9WZwMfyjdU94kLuxqUg
---

12716a21f997ca036ccebf918774e779ca8bad95