summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-09-25 15:39:22 -0700
committerSage Weil <sage@inktank.com>2013-09-25 15:39:22 -0700
commitaead63cf0b90e03f2d4f2ccf4441982ae0bc7e33 (patch)
treea753613030631758e279e78ea574735db2efd27c
parent9a9e4ca284309530047322d398534c8ebd1e15a5 (diff)
parent7bbadf1959ca37f454e4a23650a3b28f4684313f (diff)
downloadceph-aead63cf0b90e03f2d4f2ccf4441982ae0bc7e33.tar.gz
Merge pull request #637 from dachary/master
mailmap: add Matthew Roy, Matthew Wodrich
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index e58ee688622..fc4a1eb9ce9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -79,3 +79,6 @@ Holger Macht <hmacht@suse.de> <holger@homac.de>
Volker Assmann <volker@twisted-nerve.de> <volker@stan.local>
Volker Assmann <volker@twisted-nerve.de> <volker@36-135.mops.RWTH-Aachen.DE>
Sebastien Han <sebastien.han@enovance.com> <sebastien.han@enovance.com>
+Matthew Roy <matthew@royhousehold.net> <matthew@matthew-ubuntu.(none)>
+Matthew Roy <matthew@royhousehold.net> <mroy@sandbox-ed.com>
+Matthew Wodrich <matthew.wodrich@dreamhost.com> <mattheww@Mattsbox.(none)>