]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2772
authorHarlan Stenn <stenn@ntp.org>
Thu, 14 Jan 2016 09:30:27 +0000 (09:30 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 14 Jan 2016 09:30:27 +0000 (09:30 +0000)
into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-p6+

bk: 56976ab30wONCVe4GIO0FyjTbYm9LA

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge