From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 11 Jul 2015 20:36:29 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable-unity+
X-Git-Tag: NTP_4_3_58~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddd2951f11de20ccec7e02228aa9887eda0377ff;p=thirdparty%2Fntp.git

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

bk: 55a17e4dbGtS3BA2kIT-PDxPI6vtUg
---

ddd2951f11de20ccec7e02228aa9887eda0377ff