Merge pull request libgit2#4941 from libgit2/ethomson/mailmap

mailmap: prefer ethomson@edwardthomson.com

Author: ethomson

.mailmap

@@ -16,7 +16,7 @@ Xavier L. <xavier.l@afrosoft.tk> <xavier.l@afrosoft.tk>
 Sascha Cunz <sascha@babbelbox.org> <Sascha@BabbelBox.org>
 Authmillenon <authmillenon@googlemail.com> <martin@ucsmail.de>
 Authmillenon <authmillenon@googlemail.com> <authmillenon@googlemail.com>
-Edward Thomson <ethomson@github.com> <ethomson@microsoft.com>
-Edward Thomson <ethomson@github.com> <ethomson@edwardthomson.com>
+Edward Thomson <ethomson@edwardthomson.com> <ethomson@microsoft.com>
+Edward Thomson <ethomson@edwardthomson.com> <ethomson@github.com>
 J. David Ibáñez <jdavid.ibp@gmail.com> <jdavid@itaapy.com>
 Russell Belfer <rb@github.com> <arrbee@arrbee.com>