From: Tomasz Flendrich <tflendrich@ntp.org>
Date: Sun, 26 Jul 2015 21:24:39 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
X-Git-Tag: NTP_4_3_65~7^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d358dcdff05775b957db07966db93b4e473fbe32;p=thirdparty%2Fntp.git

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

bk: 55b55017wGS3Wyna2XJYVp2K4RdK4A
---

d358dcdff05775b957db07966db93b4e473fbe32