From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 19 Dec 2014 08:06:17 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-dev-sec
X-Git-Tag: NTP_4_2_8~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b35f58f7f6d123059a66c314a39ef9db108818d;p=thirdparty%2Fntp.git

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

bk: 5493dc79hVEY5OxvMqRYtL8JI8ruxA
---

4b35f58f7f6d123059a66c314a39ef9db108818d