From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 5 Dec 2015 11:26:39 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_87~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d09e6a1f56e4400e03d1363e6e332ffb280d491b;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: 5662c9efH2rm4pNv_rmRc00Wo1xfPA
---

d09e6a1f56e4400e03d1363e6e332ffb280d491b