From: Tomasz Flendrich Date: Sun, 12 Jul 2015 20:00:06 +0000 (+0000) Subject: Merge psp-deb1.ntp.org:/home/lokeshw24/ntp-stable-unity/ X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dbaf231267db2ea63661fc8bb7e9daca61b900e;p=thirdparty%2Fntp.git Merge psp-deb1.ntp.org:/home/lokeshw24/ntp-stable-unity/ into psp-deb1.ntp.org:/home/tflendrich/ntpd_tests/ntp-stable-unity bk: 55a2c746bfIk0CjZHinI6LC2Ac97Zg --- 0dbaf231267db2ea63661fc8bb7e9daca61b900e