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

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

bk: 55918953WyheooebR2me5dTcSjAXjw
---

d590c705ccd4b2611c1016079517108ded8e3353