From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 7 Jun 2015 23:40:48 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_3_37~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d33d1b0fa154c89fc27214370c9f5508bba647a;p=thirdparty%2Fntp.git

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

bk: 5574d680VZvE7Q4XHSxt4Wk6G-IZ1A
---

1d33d1b0fa154c89fc27214370c9f5508bba647a