[PATCH] Use mailmap to coalesce emails