]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 14 Jun 2015 00:11:19 +0000 (00:11 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sun, 14 Jun 2015 00:11:19 +0000 (00:11 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 557cc6a7Qa6xhlDYk4QI_af6Fp8wqw


Trivial merge