]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Fri, 31 Jul 2015 08:01:43 +0000 (08:01 +0000)
committerHarlan Stenn <stenn@ntp.org>
Fri, 31 Jul 2015 08:01:43 +0000 (08:01 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 55bb2b67th8z2Mmy7IFNtQKRWo5Tsg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge