From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 18 Dec 2014 10:09:23 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-dev-sec
X-Git-Tag: NTP_4_2_8~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4c7e3ced81d30743b222406bc38d2a34d6cc270;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-dev-sec
into  psp-deb1.ntp.org:/home/stenn/ntp-dev-sec-2671

bk: 5492a7d3gz-5xpq6BCQE24xwtDxNLA
---

a4c7e3ced81d30743b222406bc38d2a34d6cc270