From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 17 Jun 2015 08:19:24 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_3_42~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae9ba0bc1da37424fc1751bccf5599c52db525a2;p=thirdparty%2Fntp.git

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

bk: 55812d8cq5ubvQ9O4JfmaAdfMscpQw
---

ae9ba0bc1da37424fc1751bccf5599c52db525a2