From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 25 Nov 2015 11:52:11 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_83~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df77ed10686e3f60ac4173d5a1dc3da615b21b56;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: 5655a0ebB3qMTxTD7IIsr1o8jlYVAA
---

df77ed10686e3f60ac4173d5a1dc3da615b21b56