]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 22 Mar 2015 06:39:08 +0000 (06:39 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sun, 22 Mar 2015 06:39:08 +0000 (06:39 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2777

bk: 550e638c4HQJ-ryNYOJ6XTY-RPJplQ

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge