From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 24 Apr 2015 09:25:39 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable-2776
X-Git-Tag: NTP_4_3_18~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27e99ad991cd9495c03a3be176d1a73b08a726e4;p=thirdparty%2Fntp.git

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

bk: 553a0c13AhaFOvKKQaENzoAfF7YIxQ
---

27e99ad991cd9495c03a3be176d1a73b08a726e4