]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/stenn/ntp-stable-p5
authorHarlan Stenn <stenn@ntp.org>
Tue, 5 Jan 2016 11:02:27 +0000 (11:02 +0000)
committerHarlan Stenn <stenn@ntp.org>
Tue, 5 Jan 2016 11:02:27 +0000 (11:02 +0000)
into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2952-collapse

bk: 568ba2c3bs8_963p-Xoa6jebOmP0xw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge