From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 14 Jun 2015 00:11:19 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_43~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5f124f9fcfbd8dc031994f99a1ca3d8417297ec;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: 557cc6a7Qa6xhlDYk4QI_af6Fp8wqw
---

a5f124f9fcfbd8dc031994f99a1ca3d8417297ec