summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorYaroslav Halchenko <debian@onerussian.com>2014-06-14 13:34:18 +0200
committerYaroslav Halchenko <debian@onerussian.com>2014-06-14 13:34:18 +0200
commit9f010b1561421d8b3e128e07b50de9919955f258 (patch)
tree8b692a5cc9abe7024da3a6809f5c5dc5b7c6b7b6 /.mailmap
nitime (0.5-1) unstable; urgency=medium
* New release - does not ship sphinxext/inheritance_diagram.py any longer (Closes: #706533) * debian/copyright - extended to cover added 3rd party snippets and updated years * debian/watch - updated to use githubredir.debian.net service * debian/patches - debian/patches/up_version_info_python2.6 for compatibility with python2.6 (on wheezy etc) # imported from the archive
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap9
1 files changed, 9 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..58cfa28
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,9 @@
+Ariel Rokem <arokem@berkeley.edu> arokem <arokem@berkeley.edu>
+Ariel Rokem <arokem@gmail.com> arokem <arokem@gmail.com>
+Michael Waskom <mwaskom@mit.edu> mwaskom <mwaskom@mit.edu>
+Mike Trumpis <mtrumpis@berkeley.edu> miketrumpis <mtrumpis@gmail.com>
+Jarrod Millman <jarrod.millman@gmail.com> Jarrod Millman <millman@berkeley.edu>
+Jarrod Millman <jarrod.millman@gmail.com> jarrodmillman <millman@berkeley.edu>
+Jarrod Millman <jarrod.millman@gmail.com> jarrod <jarrod@fedora11.(none)>
+Kilian Koepsell <kilian@berkeley.edu> kilian@berkeley.edu <kilian@phasor.local>
+Kilian Koepsell <kilian@berkeley.edu> koepsell <kilian@berkeley.edu>