From: Lokesh Walase <lokeshw24@ntp.org>
Date: Wed, 29 Jul 2015 08:03:34 +0000 (+0530)
Subject: Merge lokeshw24@psp-deb1:/home/viperus/ntp-stable-unity
X-Git-Tag: NTP_4_3_67~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2782a59a134007a6bce752f475af138012a363ec;p=thirdparty%2Fntp.git

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

bk: 55b888d6rfx8ZH_1trthZDWOpQHopA
---

2782a59a134007a6bce752f475af138012a363ec