From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 28 Feb 2015 12:05:31 +0000 (+0000)
Subject: Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88aae13935b298adc1dd20857441745dbffe277e;p=thirdparty%2Fntp.git

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

bk: 54f1af0b40bgTHRw2CFVIztNXgtMZw
---

88aae13935b298adc1dd20857441745dbffe277e