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