]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:/home/stenn/ntp-stable-2806
authorHarlan Stenn <stenn@ntp.org>
Sat, 2 May 2015 04:42:52 +0000 (04:42 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sat, 2 May 2015 04:42:52 +0000 (04:42 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-2806

bk: 554455ccZ_Icuh4XbpuXOBq-YVq8Nw


Trivial merge