]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/stenn/ntp-stable-2776
authorHarlan Stenn <stenn@ntp.org>
Fri, 24 Apr 2015 09:25:39 +0000 (09:25 +0000)
committerHarlan Stenn <stenn@ntp.org>
Fri, 24 Apr 2015 09:25:39 +0000 (09:25 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 553a0c13AhaFOvKKQaENzoAfF7YIxQ


Trivial merge