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

1fb944e07f778ec35d3759e26fd0ab2f696ae720