Release: Added email aliases

gseguin · gseguin · commit 0fbde9ebcd07 · 2013-12-15T14:35:00.000-07:00
diff --git a/.mailmap b/.mailmap
@@ -4,6 +4,7 @@ Alexander Schmitz <arschmitz@gmail.com> <alexanderschmitz@Alexanders-MacBook-Pro
 Alexander Schmitz <arschmitz@gmail.com> <arschmitz>
 Alexandre Capt <acapt@adobe.com>
 Andrew Haller <andrew.haller@aeonblu.com>
+Anne-Gaelle Colom <coloma@westminster.ac.uk> <coloma@wmin.ac.uk>
 Ben Clinkinbeard <ben.clinkinbeard@gmail.com>
 Brad Broulik <brad.broulik@gmail.com>
 Brad Broulik <brad.broulik@gmail.com> <bbroulik@yahoo.com>
@@ -35,6 +36,7 @@ Jacob Gable <jacob.gable@gmail.com>
 Jake Boone <jakeboone02@gmail.com>
 James Burke <jrburke@gmail.com>
 Jason Crane <jasonlcrane@gmail.com>
+Jason Scott <jasscott@blackberry.com> <me@jasondscott.com>
 Jasper de Groot <jasper@ugomobi.com> <mail@ugomobi.com>
 John Resig <jeresig@gmail.com>
 Jonathan Hogervorst <jonathan@buzzera.com> <jonathan@hogervorst.info>

-Original file line number
+Diff line change
 Alexander Schmitz <[email protected]> <arschmitz>
 Alexandre Capt <[email protected]>
 Andrew Haller <[email protected]>
 +Anne-Gaelle Colom <[email protected]> <[email protected]>
 Ben Clinkinbeard <[email protected]>
 Brad Broulik <[email protected]>
 Brad Broulik <[email protected]> <[email protected]>
 Jake Boone <[email protected]>
 James Burke <[email protected]>
 Jason Crane <[email protected]>
 +Jason Scott <[email protected]> <[email protected]>
 Jasper de Groot <[email protected]> <[email protected]>
 John Resig <[email protected]>
 Jonathan Hogervorst <[email protected]> <[email protected]>