From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 14 Jan 2016 11:29:40 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2971
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00f45db0e126ee5ae615d1c9596c077b9a2d9f42;p=thirdparty%2Fntp.git

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

bk: 569786a4LyI9nUmgl4iZdPS_eu2K2w
---

00f45db0e126ee5ae615d1c9596c077b9a2d9f42