[PATCH] mailmap: consolidate my email addresses