From: Tomasz Flendrich <tflendrich@ntp.org>
Date: Mon, 27 Jul 2015 00:50:42 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable-unity
X-Git-Tag: NTP_4_3_65~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e1f86b4e70c569d0434b894fe974fac29df881d;p=thirdparty%2Fntp.git

Merge psp-at1.ntp.org:/home/stenn/ntp-stable-unity
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/tflendrich/ntpd_tests_clean/ntp-stable-unity

bk: 55b580620gq3hfm8VeSWFpjUwj8ysA
---

3e1f86b4e70c569d0434b894fe974fac29df881d