From 44158164682f06a4cbee7ceaf5c2b79e6204d9ef Mon Sep 17 00:00:00 2001
From: Ken Spencer <ken@electrocode.net>
Date: Sat, 28 Oct 2017 18:17:49 -0400
Subject: [PATCH] update mailmap with a few more emails to correctly merge the
 right commits

---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 9600cc390..00c8337aa 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,7 +16,9 @@ Daniel Folkinshteyn <nanotube@users.sourceforge.net> nanotube <nanotube@users.sf
 James Lu <GLolol@overdrivenetworks.com> <GLolol1@hotmail.com>
 James Lu <GLolol@overdrivenetworks.com> <glolol1@hotmail.com>
 James Lu <GLolol@overdrivenetworks.com> <glolol@overdrive.pw>
+James Lu <GLolol@overdrivenetworks.com> <james@overdrivenetworks.com>
 James McCoy <jamessan@users.sourceforge.net>
+Ken Spencer <ken@electrocode.net> Iota Spencer <iota@electrocode.net>
 Mikaela Suomalainen <mikaela.suomalainen@outlook.com> Mika Suomalainen <mika.henrik.mainio@hotmail.com>
 Mikaela Suomalainen <mikaela.suomalainen@outlook.com> Mika Suomalainen <mkaysi@outlook.com>
 Mikaela Suomalainen <mikaela.suomalainen@outlook.com> Mika Suomalainen <mkaysi@users.sourceforge.net>