rebase on master

story645 · story645 · commit 2d4c1626487b · 2016-08-23T10:01:08.000-04:00
diff --git a/.mailmap b/.mailmap
@@ -1,4 +1,5 @@
 Adrien F. Vincent <vincent.adrien@gmail.com>
+<<<<<<< 3d31c694aa6b77b9d8b7b1897f3a67f5be1a54ea
 Andrew Dawson <ajdawson@acm.org> <dawson@atm.ox.ac.uk>
 anykraus <kraus@mpip-mainz.mpg.de> <anykraus@users.noreply.github.com>
 Ariel Hernán Curiale <curiale@gmail.com>
@@ -8,6 +9,15 @@ Casper van der Wel <caspervdw@gmail.com>
 Christoph Gohlke <cgohlke@uci.edu> <cgohlke@uci.edu>
 Cimarron Mittelsteadt <cimarronm@gmail.com>
 Daniel Hyams <dhyams@gmail.com>
+=======
+Andrew Dawson <ajdawson@acm.org> Andrew Dawson <dawson@atm.ox.ac.uk>
+anykraus <kraus@mpip-mainz.mpg.de> anykraus <anykraus@users.noreply.github.com>
+Ben Cohen <bj.cohen19@gmail.com> Ben Cohen <ben@cohen-family.org>
+Ben Root <ben.v.root@gmail.com> Benjamin Root <ben.v.root@gmail.com>
+Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
+Christoph Gohlke <cgohlke@uci.edu> C. Gohlke <cgohlke@uci.edu>
+Cimarron Mittelsteadt <cimarronm@gmail.com> Cimarron <cimarronm@gmail.com>
+>>>>>>> Merge pull request #6683 from afvincent/new_entry_mailmap_for_afvincent
 Daniel Hyams <dhyams@gmail.com> Daniel Hyams <dhyams@gitdev.(none)>
 David Kua <david@kua.io> <david.kua@mail.utoronto.ca>
 endolith <endolith@gmail.com>
