]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge nemesis.localnet:C:/Data/ntp-dev/src/ntp-stable-3144/..\ntp-stable-3095winbuild
authorJuergen Perlinger <perlinger@ntp.org>
Sat, 21 Jan 2017 13:30:07 +0000 (14:30 +0100)
committerJuergen Perlinger <perlinger@ntp.org>
Sat, 21 Jan 2017 13:30:07 +0000 (14:30 +0100)
into  nemesis.localnet:C:/Data/ntp-dev/src/ntp-stable-3144

bk: 5883625fFiKZYtcSy8kr8BA4SXXyvw


Trivial merge