]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 3 Jun 2015 05:44:28 +0000 (05:44 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 3 Jun 2015 05:44:28 +0000 (05:44 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/abe/ntp-stable-2834

bk: 556e943cy1x_B5ndh2iLb04tszBkgw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge