]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
authorTomasz Flendrich <tflendrich@ntp.org>
Mon, 6 Jul 2015 13:55:56 +0000 (13:55 +0000)
committerTomasz Flendrich <tflendrich@ntp.org>
Mon, 6 Jul 2015 13:55:56 +0000 (13:55 +0000)
into  psp-deb1.ntp.org:/home/tflendrich/codeReview/ntp-stable-unity

bk: 559a88ecdQivMLkrHIzX-V7BuFzTfA

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge