]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 2 Dec 2015 11:07:50 +0000 (11:07 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 2 Dec 2015 11:07:50 +0000 (11:07 +0000)
into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 565ed106i_zd0o15dH0iJZ_SdTmevQ

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge