From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 2 Dec 2015 11:21:11 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_85~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb587b6227dd024da89f83c0b51097073d710a2b;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: 565ed427zaO0I6Zg7ayCcgPMro5DUA
---

bb587b6227dd024da89f83c0b51097073d710a2b