]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/stenn/ntp-stable-p5
authorHarlan Stenn <stenn@ntp.org>
Thu, 7 Jan 2016 22:22:38 +0000 (22:22 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 7 Jan 2016 22:22:38 +0000 (22:22 +0000)
into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 568ee52eLx6g4klNPnCjTo99j35uDw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge