]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge ssh://perlinger@psp-deb1.ntp.org/ntp-stable-3031
authorJuergen Perlinger <perlinger@ntp.org>
Wed, 30 Mar 2016 20:15:04 +0000 (22:15 +0200)
committerJuergen Perlinger <perlinger@ntp.org>
Wed, 30 Mar 2016 20:15:04 +0000 (22:15 +0200)
into  nemesis.localnet:C:/Data/ntp-dev/src/ntp-stable-3031

bk: 56fc33c8R9V8OXh2tqw1dAf45B-_JQ


Trivial merge