#2283 Let's not email the admins when there is a conflict in a PR
Merged by pingou. Opened by pingou.
less_logging  into  master

Download 2283.patch
no initial comment

Heh. Looks good to me.

Metadata