From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 16 Mar 2015 09:23:05 +0000 (+0000)
Subject: Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-2763
X-Git-Tag: NTP_4_3_9~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbd35d80f945225253c58eb8e7db919b19fb16d6;p=thirdparty%2Fntp.git

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

bk: 5506a0f9SnvdS1lw5J3WRIgPgh2Vqw
---

bbd35d80f945225253c58eb8e7db919b19fb16d6