From: Lokesh Walase <lokeshw24@ntp.org>
Date: Sat, 4 Jul 2015 14:35:17 +0000 (+0530)
Subject: Merge lokeshw24@psp-deb1.ntp.org:/home/viperus/ntp-stable-unity
X-Git-Tag: NTP_4_3_65~7^2~11^2~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=480dc80d51fce278acc857bb7cd59797ed6efc09;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: 5597ef25vBYiAJYun4U3JtBbyt7y-Q
---

480dc80d51fce278acc857bb7cd59797ed6efc09