From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 12 Jun 2015 10:15:17 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/viperus/ntp-stable-unity/sntp/unity/../../
X-Git-Tag: NTP_4_3_40~6^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=226d001054207a7fb03321faf58acb1ae43ff330;p=thirdparty%2Fntp.git

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

bk: 557ab135asnWvFtNSaxGKRJjJvs8VQ
---

226d001054207a7fb03321faf58acb1ae43ff330