From: Tomasz Flendrich <tflendrich@ntp.org>
Date: Thu, 23 Jul 2015 16:48:06 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/viperus/ntp-stable-unity/
X-Git-Tag: NTP_4_3_65~7^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9bdcc6d635ecf9218d62d1b7d54d143c42cd4cf;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/viperus/ntp-stable-unity/
into  psp-deb1.ntp.org:/home/tflendrich/ntpd_tests/ntp-stable-unity

bk: 55b11ac6EZDsHJuGyD8bXu_oN2MaKA
---

c9bdcc6d635ecf9218d62d1b7d54d143c42cd4cf