From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 7 Jun 2015 03:16:44 +0000 (+0000)
Subject: Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_36~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e456348e33b0c208cae1baf925f9f59a608062a2;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: 5573b79cPc0HH2PKJkeSSegbUNbvtA
---

e456348e33b0c208cae1baf925f9f59a608062a2