commit 7e759fbd60a8483d2865572df85c2835756f2ae8
author Jason Ekstrand <jason.ekstrand@intel.com> Wed May 11 12:27:15 2016 -0700
committer Jason Ekstrand <jason.ekstrand@intel.com> Wed May 11 12:27:15 2016 -0700
tree a70a055ac60ac125630021ae0c5bdb34de31437a
parent 9c3392cb3a23f6e681b9110284417db5b34e3793

.mailmap: Use Connor Abbott's personal e-mail

.mailmap

diff --git a/.mailmap b/.mailmap
index 10811c0..242e88e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -111,8 +111,8 @@
 Claudio Ciccani <klan@directfb.org> <klan@users.sf.net>
 Claudio Ciccani <klan@directfb.org> <klan@users.sourceforge.net>
 
-Connor Abbott <connor.abbott@intel.com> <connor.w.abbott@intel.com>
-Connor Abbott <connor.abbott@intel.com> <cwabbott0@gmail.com>
+Connor Abbott <cwabbott0@gmail.com> <connor.w.abbott@intel.com>
+Connor Abbott <cwabbott0@gmail.com> <connor.abbott@intel.com>
 
 Corbin Simpson <MostAwesomeDude@gmail.com> <mostawesomed...@gmail.com>
 Corbin Simpson <MostAwesomeDude@gmail.com> <mostawesomedude@gmail.com>