From: Lokesh Walase <lokeshw24@ntp.org>
Date: Sat, 13 Jun 2015 09:26:47 +0000 (+0530)
Subject: Merge lokeshw24@psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
X-Git-Tag: NTP_4_3_42~2^2~9^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2881944abd03ea1296415fa5d852ed129903ab9;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: 557bf757cEsUssgGmDMZ3Y3ysUI7Ww
---

f2881944abd03ea1296415fa5d852ed129903ab9