From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 31 Jul 2015 08:01:43 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_68~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dea530b959d3f7f67100f139dc7e8b401fcbc47c;p=thirdparty%2Fntp.git

Merge psp-at1.ntp.org:/home/stenn/ntp-stable
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 55bb2b67th8z2Mmy7IFNtQKRWo5Tsg
---

dea530b959d3f7f67100f139dc7e8b401fcbc47c