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

917e253a5c0fcf5bc27ad11a7bae3ce58fa2e709