]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2bb42d3 6065e8f)
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050
authorDave Hart <hart@ntp.org>
Sat, 26 Nov 2011 19:49:25 +0000 (19:49 +0000)
committerDave Hart <hart@ntp.org>
Sat, 26 Nov 2011 19:49:25 +0000 (19:49 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050-59-66-68-69

bk: 4ed142c5MsN9_VdVSQYISumRqE7jFw


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