branching: merge stable into default
Merge was trivial (except for the conflict from a graft about dirstate that could be safely discarded)
Edited by Pierre-Yves David
Merge was trivial (except for the conflict from a graft about dirstate that could be safely discarded)