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

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

bk: 559393551U8nvm1dpzN2nOE8wcxWww
---

ba8db6c8d1c827cabe2eb7af0df5cb1315cb0cf8