]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Fri, 3 Apr 2015 08:41:59 +0000 (08:41 +0000)
committerHarlan Stenn <stenn@ntp.org>
Fri, 3 Apr 2015 08:41:59 +0000 (08:41 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2779-2781

bk: 551e52577rf0oGsQvGEYO7ljgh21Xg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge