From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 14 Jun 2015 05:20:54 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_3_41~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=425eac58604fcb6094e113f46687af4998c2d9fe;p=thirdparty%2Fntp.git

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

bk: 557d0f369P7EhvN3rYpvLh2Ec1SMGg
---

425eac58604fcb6094e113f46687af4998c2d9fe