]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 29 Jun 2015 01:19:33 +0000 (01:19 +0000)
committerHarlan Stenn <stenn@ntp.org>
Mon, 29 Jun 2015 01:19:33 +0000 (01:19 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2853

bk: 55909d25db77dD2-ETWQI8Bn_1iVaQ

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge