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

3f34e3c8f1aa92381cfec591de4d477da593e6e6