From: Lokesh Walase Date: Mon, 22 Jun 2015 07:29:43 +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=bb37fcf89b07201d85f5b2a8687524f18a42b6b9;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: 5587b9675sC87Oj4pbU1e4f5_bBwQQ --- bb37fcf89b07201d85f5b2a8687524f18a42b6b9