From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 2 Dec 2015 11:05:31 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2967
X-Git-Tag: NTP_4_3_85~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08314a21a7344671f761d42300489980f435f034;p=thirdparty%2Fntp.git

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

bk: 565ed07bkq-wcFDCu9yP-inEWIOZyg
---

08314a21a7344671f761d42300489980f435f034