From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 4 May 2015 22:56:11 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_3_29~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d072f661ffc501cbcdb2a3de3714c743560252e1;p=thirdparty%2Fntp.git

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

bk: 5547f90bEnF4fZMtKs95oaU7BFU1fw
---

d072f661ffc501cbcdb2a3de3714c743560252e1