From: Lokesh Walase <lokeshw24@ntp.org>
Date: Thu, 9 Jul 2015 15:21:05 +0000 (+0530)
Subject: Merge lokeshw24@psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
X-Git-Tag: NTP_4_3_65~7^2~11^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e4e6de60a079fff67543d847bd51c51fe71582f;p=thirdparty%2Fntp.git

Merge lokeshw24@psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
into  dadasgift.(none):/home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity

bk: 559e9161cx-NEEr9PiM5HBmXMiPGqQ
---

5e4e6de60a079fff67543d847bd51c51fe71582f