]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 13 Jun 2015 09:02:26 +0000 (09:02 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sat, 13 Jun 2015 09:02:26 +0000 (09:02 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 557bf1a2Sybax9tEFRT0Z-_PfKYwQw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge