From: Lokesh Walase Date: Wed, 1 Jul 2015 09:38:54 +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=f586cd7568ab14c13a8b6e2f78de8e95213d79ad;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: 5593b52eEyittZiuw4RYw_a4FEq9Yg --- f586cd7568ab14c13a8b6e2f78de8e95213d79ad