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

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

bk: 5574ee47K9HEAEfSi68VL9S4j5_Xdw
---

9a897612c588e15bf0f87a165cb842d8e66f2e2c