]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 25 Nov 2015 12:25:06 +0000 (12:25 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 25 Nov 2015 12:25:06 +0000 (12:25 +0000)
into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 5655a8a2NyxwyVfsqNa8srzTGJzvUw


Trivial merge