From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 19 Mar 2016 09:22:16 +0000 (-0700)
Subject: Merge stenn@psp-deb1.ntp.org:ntp-stable
X-Git-Tag: NTP_4_2_8P8~7^2~1^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b6d5ed5dab8150f2de8e79e5056def1db894114;p=thirdparty%2Fntp.git

Merge stenn@psp-deb1.ntp.org:ntp-stable
into  max.pfcs.com:/usr/home/harlan/ntp-stable

bk: 56ed1a48tnUexI4VLB0b2DwNByhqqQ
---

4b6d5ed5dab8150f2de8e79e5056def1db894114