]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 16 Jul 2015 07:54:16 +0000 (07:54 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 16 Jul 2015 07:54:16 +0000 (07:54 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 55a76328Ne7oQJkYLnzHcUPhMsbTAg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge