]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
authorTomasz Flendrich <tflendrich@ntp.org>
Wed, 8 Jul 2015 00:54:40 +0000 (00:54 +0000)
committerTomasz Flendrich <tflendrich@ntp.org>
Wed, 8 Jul 2015 00:54:40 +0000 (00:54 +0000)
into  psp-deb1.ntp.org:/home/tflendrich/codeReview/ntp-stable-unity

bk: 559c74d003TAzCDMvr9dA8Mlvf3-1w

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge