]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 3 Aug 2015 09:32:32 +0000 (09:32 +0000)
committerHarlan Stenn <stenn@ntp.org>
Mon, 3 Aug 2015 09:32:32 +0000 (09:32 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 55bf3530ulVG5qnWLLskeVvdy-M30g

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge