From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 26 Nov 2015 06:26:36 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_84~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6f5540d72454aa6ec9711d67b1266617aef495b;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: 5656a61cb0MI-xbDkAy3mzJMAO7U1g
---

c6f5540d72454aa6ec9711d67b1266617aef495b