From: Lokesh Walase Date: Sat, 13 Jun 2015 09:26:47 +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=5de880e0aa4ed442e7ffda3ed80467d3217d19d0;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: 557bf757cEsUssgGmDMZ3Y3ysUI7Ww --- 5de880e0aa4ed442e7ffda3ed80467d3217d19d0