From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 30 Sep 2015 07:47:23 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_74~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cc8eafe46c8f06872e3ca15c0c20080460a3e14;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 560b938bciJwI3fwlrmr8TRsjtsCAQ
---

0cc8eafe46c8f06872e3ca15c0c20080460a3e14