From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 2 May 2015 04:42:52 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable-2806
X-Git-Tag: NTP_4_3_26~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2bb50dd272bb0d972c6e55e2a9df400a5e2015c;p=thirdparty%2Fntp.git

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

bk: 554455ccZ_Icuh4XbpuXOBq-YVq8Nw
---

f2bb50dd272bb0d972c6e55e2a9df400a5e2015c