]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 28 Aug 2013 09:47:48 +0000 (09:47 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 28 Aug 2013 09:47:48 +0000 (09:47 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 521dc744lJbgEQQbLJLzmgWcgbo60Q

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge