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

bk: 559e8bd3-AUglX6Jnk_YGrCwCw0mPQ

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge