From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 13 Jun 2015 09:02:26 +0000 (+0000)
Subject: Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_40~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57eeee1720bc6219c97b6b4bbdaa2524f96baa93;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: 557bf1a2Sybax9tEFRT0Z-_PfKYwQw
---

57eeee1720bc6219c97b6b4bbdaa2524f96baa93