aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap6
1 files changed, 6 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..46423bd59
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+Joey Hess <joey@kitenet.net> http://joey.kitenet.net/ <joey@web>
+Joey Hess <joey@kitenet.net> http://joeyh.name/ <joey@web>
+Joey Hess <joey@kitenet.net> http://joeyh.name/ <http://joeyh.name/@web>
+Yaroslav Halchenko <debian@onerussian.com>
+Yaroslav Halchenko <debian@onerussian.com> http://yarikoptic.myopenid.com/ <site-myopenid@web>
+Yaroslav Halchenko <debian@onerussian.com> https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY <Yaroslav@web>