From: Lokesh Walase Date: Mon, 6 Jul 2015 14:43:53 +0000 (+0530) Subject: Merge lokeshw24@psp-deb1.ntp.org:/home/stenn/ntp-stable-unity X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f95a31f8f8527ed28147cd335010db2c123fb400;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: 559a9429wV2q720FwtaPFd9vEko9Yw --- f95a31f8f8527ed28147cd335010db2c123fb400