summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2014-11-11 11:53:55 -0500
committerMicah Anderson <micah@riseup.net>2014-11-11 11:53:55 -0500
commit7d5c3dcd969161322deed6c43f8a6a3cb92c3369 (patch)
tree109b05c88c7252d7609ef324d62ef9dd7f06123f /.mailmap
parent44be832c5708baadd146cb954befbc3dcad8d463 (diff)
upgrade to 14.4.1upstream/14.4.1
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap10
1 files changed, 10 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..92f6a18
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,10 @@
+Brian E. Granger <ellisonbg@gmail.com> Brian Granger <ellisonbg@gmail.com>
+Chris Laws <clawsicus@gmail.com> Chris Laws <claws@localhost>
+Daniel Lundin <dln@eintr.org> Daniel Lundin <dln@spotify.com>
+Min Ragan-Kelley <benjaminrk@gmail.com> Min RK <benjaminrk@gmail.com>
+Min Ragan-Kelley <benjaminrk@gmail.com> MinRK <benjaminrk@gmail.com>
+Michel Pelletier <pelletier.michel@gmail.com> Michel Pelletier <pelletier.michel@yahoo.com>
+Nicholas Piƫl <nicholas@nichol.as> nicholas <nicholas@bastet.ss.sitesupport.com>
+Felipe Cruz <felipecruz@loogica.net> felipecruz <felipecruz@loogica.net>
+Felipe Cruz <felipecruz@loogica.net> Felipe cruz <felipecruz@loogica.net>
+Yannick Hold <yannickhold@gmail.com> Yannick Hold <x_godsoul@hotmail.com> \ No newline at end of file