]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/stenn/ntp-stable-unity
authorTomasz Flendrich <tflendrich@ntp.org>
Mon, 27 Jul 2015 00:50:42 +0000 (00:50 +0000)
committerTomasz Flendrich <tflendrich@ntp.org>
Mon, 27 Jul 2015 00:50:42 +0000 (00:50 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/tflendrich/ntpd_tests_clean/ntp-stable-unity

bk: 55b580620gq3hfm8VeSWFpjUwj8ysA

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge