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

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

bk: 5573e464rnvozGc0L8RW1d-KDWYG9g
---

78caa66e929406a1cb49bbecf54bfefb19202824