From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 13 Jun 2015 09:59:48 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_3_40~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01f6fa78c69824348b2836cd194270634ab9db8d;p=thirdparty%2Fntp.git

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

bk: 557bff149IopIAmRbK81kqXgvDFRug
---

01f6fa78c69824348b2836cd194270634ab9db8d