From: Tomasz Flendrich <tflendrich@ntp.org>
Date: Sun, 12 Jul 2015 20:00:06 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/lokeshw24/ntp-stable-unity/
X-Git-Tag: NTP_4_3_65~7^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22f9ea494ceeb0f0cbca9cc3871523bc4e6bed95;p=thirdparty%2Fntp.git

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

bk: 55a2c746bfIk0CjZHinI6LC2Ac97Zg
---

22f9ea494ceeb0f0cbca9cc3871523bc4e6bed95