Merge pull request #606 from firedrakeproject/mailmap

add/update mailman entries
firedrakeproject · Oct 12, 2015 · d092cab · d092cab
2 parents cd12e37 + f8a67f4
commit d092cab
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/.mailmap b/.mailmap
@@ -1,6 +1,9 @@
+Gheorghe-Teodor Bercea <gb308@doc.ic.ac.uk> <foraker.doc.ic.ac.uk>
+Colin Cotter <colin.cotter@imperial.ac.uk> <colin.cotter@ic.ac.uk>
 David A Ham <david.ham@imperial.ac.uk> <David.Ham@imperial.ac.uk>
-Andrew McRae <a.mcrae12@imperial.ac.uk>
-Andrew McRae <a.mcrae12@imperial.ac.uk>  <dorugeber@users.noreply.github.com>
+David A Ham <david.ham@imperial.ac.uk> <dham@dyn1179-48.wlan.ic.ac.uk>
 Miklós Homolya <m.homolya14@imperial.ac.uk>
 Miklós Homolya <m.homolya14@imperial.ac.uk> <miklos.homolya@tum.de>
-Gheorghe-Teodor Bercea <gb308@doc.ic.ac.uk> <foraker.doc.ic.ac.uk>
+Christian Jacobs <c.jacobs10@imperial.ac.uk> <ctjacobs@users.noreply.github.com>
+Andrew McRae <a.t.t.mcrae@bath.ac.uk> <a.mcrae12@imperial.ac.uk>
+Andrew McRae <a.t.t.mcrae@bath.ac.uk> <dorugeber@users.noreply.github.com>