From: James D. Forrester <jforrester@wikimedia.org>
Date: Wed, 11 Apr 2018 18:38:15 +0000 (-0700)
Subject: .mailmap: Join Cindy Cicalese's addresses together
X-Git-Tag: 1.31.0-rc.0~122
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=3b55b0b3b8c6d67a05685fd73be06a9b3121db9a

.mailmap: Join Cindy Cicalese's addresses together

Change-Id: I5a5920c16e2233a7b5a1805a150ec1b1b3138b03
---

diff --git a/.mailmap b/.mailmap
index 08e1aaa15f..77d2b8dd3d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -107,7 +107,8 @@ Christoph Jauera <christoph.jauera@wikimedia.de>
 Christoph Jauera <christoph.jauera@wikimedia.de> <christoph.fischer@wikimedia.de>
 Christopher Johnson <root@bugzilla.wmde.de>
 church of emacs <churchofemacs@users.mediawiki.org>
-Cindy Cicalese <cicalese@mitre.org>
+Cindy Cicalese <ccicalese@wikimedia.org>
+Cindy Cicalese <ccicalese@wikimedia.org> <cicalese@mitre.org>
 ckoerner <nobelx@gmail.com>
 Conrad Irwin <conrad.irwin+wiki@gmail.com> <conrad@users.mediawiki.org>
 Dan Duvall <dduvall@wikimedia.org>