Unverified Commit 0e00d936 authored by teor's avatar teor
Browse files

Merge branch 'maint-0.4.2' into maint-0.4.3

"ours" merge, because simiar BridgeDistribution fixes have already
been merged to maint-0.4.3. (See 32753.)

The stem changes in 33075 have already been merged to maint-0.4.3,
so this "ours" merge does not affect them.
parents de31c475 ff522053
Markdown is supported
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