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

bk: 55b0524eYTkU61kHMGefieS_dKKIbA

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge