Skip to content
Commit b9663bf0 authored by Jesse Glick's avatar Jesse Glick
Browse files

Merge (-s ours) stable-2.60 into master

parents 64e8ea3d db5b4829
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment