]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-2763
authorHarlan Stenn <stenn@ntp.org>
Mon, 16 Mar 2015 09:23:05 +0000 (09:23 +0000)
committerHarlan Stenn <stenn@ntp.org>
Mon, 16 Mar 2015 09:23:05 +0000 (09:23 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-2763

bk: 5506a0f9SnvdS1lw5J3WRIgPgh2Vqw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge