]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7bf0351 507e48f)
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 17 Jun 2015 08:19:24 +0000 (04:19 -0400)
committerHarlan Stenn <stenn@ntp.org>
Wed, 17 Jun 2015 08:19:24 +0000 (04:19 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 55812d8cq5ubvQ9O4JfmaAdfMscpQw


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