]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/stenn/ntp-stable-unity+
authorHarlan Stenn <stenn@ntp.org>
Sat, 11 Jul 2015 20:36:29 +0000 (20:36 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sat, 11 Jul 2015 20:36:29 +0000 (20:36 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable

bk: 55a17e4dbGtS3BA2kIT-PDxPI6vtUg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge