From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 3 Jun 2015 05:44:28 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_3_34~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6661a96954accdff189f1353beadcb461e93c0cc;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/abe/ntp-stable-2834

bk: 556e943cy1x_B5ndh2iLb04tszBkgw
---

6661a96954accdff189f1353beadcb461e93c0cc