]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/lokeshw24/ntp-stable-unity/
authorTomasz Flendrich <tflendrich@ntp.org>
Sun, 12 Jul 2015 20:00:06 +0000 (20:00 +0000)
committerTomasz Flendrich <tflendrich@ntp.org>
Sun, 12 Jul 2015 20:00:06 +0000 (20:00 +0000)
into  psp-deb1.ntp.org:/home/tflendrich/ntpd_tests/ntp-stable-unity

bk: 55a2c746bfIk0CjZHinI6LC2Ac97Zg


Trivial merge