From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 12 May 2015 03:30:47 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_33~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c11248cf3385bc071cce2e6e1a05199d7710ab51;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: 555173e763e3lchaQy6__QjT2gBirA
---

c11248cf3385bc071cce2e6e1a05199d7710ab51