From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 19 Mar 2016 09:11:21 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P7~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dff0a4a4bf4690dce7450a4b3695fd9a56be9182;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7

bk: 56ed17b9zc68GkrII0GZCzCDvJLdGQ
---

dff0a4a4bf4690dce7450a4b3695fd9a56be9182