From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 7 Jun 2015 08:09:43 +0000 (-0400)
Subject: Merge deacon.udel.edu:/backroom/ntp-stable
X-Git-Tag: NTP_4_3_36~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cea5122a35f2497e4c41d7a2b10e022e9c78a2b;p=thirdparty%2Fntp.git

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

bk: 5573fc479dtjuwXVoM0H_D_uYx8O5g
---

0cea5122a35f2497e4c41d7a2b10e022e9c78a2b