]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 4 Mar 2015 11:18:10 +0000 (11:18 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 4 Mar 2015 11:18:10 +0000 (11:18 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 54f6e9f2Lxb4ZP3nWl6zQHsTWSUC5Q

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge