From: Lokesh Walase Date: Wed, 17 Jun 2015 17:34:50 +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=2d7462c62cf54bb50a266b98f6f9104ec42bfab4;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: 5581afbam22Q9FFjuDxp01b9tUJvAg --- 2d7462c62cf54bb50a266b98f6f9104ec42bfab4