From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 3 Aug 2015 09:32:32 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_70~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cecbab65ab88e639101f32db724edcd5aa2c9fc8;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: 55bf3530ulVG5qnWLLskeVvdy-M30g
---

cecbab65ab88e639101f32db724edcd5aa2c9fc8