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

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

bk: 5590a917Izw7YwgaKgwaiMmjlOxrvg
---

e55f1935484d01d21be81646cc32d712213ccbec