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

bk: 56602af0vvAG0H3j2xLSnSyUWmgxfw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge