From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 20 Jul 2015 07:22:22 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_62~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d44985e0128bb95cde8f69999c9943635b20a6b5;p=thirdparty%2Fntp.git

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

bk: 55aca1aeWhOteJAlTSRm2mfdLOQXMg
---

d44985e0128bb95cde8f69999c9943635b20a6b5