]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge stenn.ntp.org:/home/stenn/ntp-stable-2782
authorHarlan Stenn <stenn@ntp.org>
Sat, 7 Mar 2015 01:54:34 +0000 (01:54 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sat, 7 Mar 2015 01:54:34 +0000 (01:54 +0000)
into  stenn.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 54fa5a5aoshzRJjoNV0UwEaRaSU_hg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge