]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c421705 b47a1ea)
Merge ssh://perlinger@psp-deb1.ntp.org//home/stenn/ntp-stable-p11
authorJuergen Perlinger <perlinger@ntp.org>
Fri, 22 Dec 2017 13:56:28 +0000 (14:56 +0100)
committerJuergen Perlinger <perlinger@ntp.org>
Fri, 22 Dec 2017 13:56:28 +0000 (14:56 +0100)
into  ntp.org:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-aesmerge

bk: 5a3d0f0cXFQav2OBe1yix2SYOJtvAg


Trivial merge
Mirror of https://github.com/ntp-project/ntp.git