From: Lokesh Walase <lokeshw24@ntp.org>
Date: Wed, 17 Jun 2015 17:34:50 +0000 (+0530)
Subject: Merge lokeshw24@psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
X-Git-Tag: NTP_4_3_43~2^2~26^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=593a180d8822e75e399c71886c770cba501d8e07;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: 5581afbam22Q9FFjuDxp01b9tUJvAg
---

593a180d8822e75e399c71886c770cba501d8e07