From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 7 Jan 2016 22:22:38 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable-p5
X-Git-Tag: NTP_4_3_89~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52bcc68d1ae88493c2c874c3028b87dd03170366;p=thirdparty%2Fntp.git

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

bk: 568ee52eLx6g4klNPnCjTo99j35uDw
---

52bcc68d1ae88493c2c874c3028b87dd03170366