From: Lokesh Walase Date: Sat, 20 Jun 2015 09:54:44 +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=b00c9742be7e58cf526de5927754a7c277cea674;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: 55853864cSTkVhmQmvMAMVt2eNB4Fw --- b00c9742be7e58cf526de5927754a7c277cea674