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

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

bk: 557bf674HfCMxXlJg52C9cPxEt14NA
---

14a007f63fcb957b9a4756da3e6992c0388b0b9b