]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/viperus/ntp-stable-unity/
authorTomasz Flendrich <tflendrich@ntp.org>
Thu, 23 Jul 2015 16:48:06 +0000 (16:48 +0000)
committerTomasz Flendrich <tflendrich@ntp.org>
Thu, 23 Jul 2015 16:48:06 +0000 (16:48 +0000)
into  psp-deb1.ntp.org:/home/tflendrich/ntpd_tests/ntp-stable-unity

bk: 55b11ac6EZDsHJuGyD8bXu_oN2MaKA


Trivial merge