From: Lokesh Walase <lokeshw24@ntp.org>
Date: Mon, 22 Jun 2015 07:29:43 +0000 (+0530)
Subject: Merge lokeshw24@psp-deb1.ntp.org:/home/viperus/ntp-stable-unity
X-Git-Tag: NTP_4_2_8P3_RC3~22^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b80de40e6e82f0a08f545c5ba42516dd3cf58afd;p=thirdparty%2Fntp.git

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

bk: 5587b9675sC87Oj4pbU1e4f5_bBwQQ
---

b80de40e6e82f0a08f545c5ba42516dd3cf58afd