From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 6 Dec 2015 11:23:08 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_88~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=896ccbe7f2094a0404955f115ec678fced7b13d6;p=thirdparty%2Fntp.git

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

bk: 56641a9cViwCx566LR_gq7GXJUziHw
---

896ccbe7f2094a0404955f115ec678fced7b13d6