From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 20 Jun 2015 23:49:01 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_3_43~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=150ab0055556cab8986b5028aa43d7b2d083d43c;p=thirdparty%2Fntp.git

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

bk: 5585fbedaoVXbMY-TgCIxhRlBkMmww
---

150ab0055556cab8986b5028aa43d7b2d083d43c