]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/.stage/h-thump2/burnicki/ntp-stable-2965
authorHarlan Stenn <stenn@ntp.org>
Tue, 17 Nov 2015 04:52:16 +0000 (04:52 +0000)
committerHarlan Stenn <stenn@ntp.org>
Tue, 17 Nov 2015 04:52:16 +0000 (04:52 +0000)
into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable

bk: 564ab280yRbsIYFqIoXFe3wpjcQIOA


Trivial merge