From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 1 Aug 2015 09:01:10 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_69~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba60eac58b1f88c19f0261a1fc798a1e0fd77354;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: 55bc8ad6XzaqTys2sH4BXs5AMWiDNw
---

ba60eac58b1f88c19f0261a1fc798a1e0fd77354