]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge ssh://perlinger@psp-deb1.ntp.org//home/stenn/ntp-stable-p11
authorJuergen Perlinger <perlinger@ntp.org>
Thu, 4 Jan 2018 07:43:31 +0000 (08:43 +0100)
committerJuergen Perlinger <perlinger@ntp.org>
Thu, 4 Jan 2018 07:43:31 +0000 (08:43 +0100)
into  hydra.localnet:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-p11

bk: 5a4ddb23aLX3wv1YzvmfigffE2yOFg


Trivial merge