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