From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 3 Dec 2015 11:43:44 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_86~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9988740f620217a501f51bc87e3e0471034397ec;p=thirdparty%2Fntp.git

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

bk: 56602af0vvAG0H3j2xLSnSyUWmgxfw
---

9988740f620217a501f51bc87e3e0471034397ec