From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 12 Jun 2015 10:00:29 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable-unity
X-Git-Tag: NTP_4_3_40~6^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=715153cbf60346991ca427a6319c63d8096b9a43;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/viperus/ntp-stable-unity

bk: 557aadbdiz8bCVRwuHYHSmoynHTXlw
---

715153cbf60346991ca427a6319c63d8096b9a43