From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 29 Jun 2015 18:48:27 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_2_8P3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80f173f01cd9ac5de04e8e4a02950cb47f785315;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2853

bk: 559192fbm_Oc6kOCMmcipvuKfc2dlg
---

80f173f01cd9ac5de04e8e4a02950cb47f785315