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

bk: 5543463b_ecQHjnfsYRhheFqaVdmGw


Trivial merge