Merge remote-tracking branch 'github/pull/686'

[chef.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index b77ecd89b0d67698aa9110b0655d282d4d2c44aa..15718e51933286e21d1edb4d70fac5f8d649b42f 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,3 @@
-Grant Slater <openstreetmap@firefishy.com> <git@firefishy.com>
+Grant Slater <openstreetmap@firefishy.com> <git@firefishy.com> <grant.slater@wearefriday.com> <github@firefishy.com>
+Guillaume Rischard <git@stereo.lu> <github@stereo.lu>

 Jochen Topf <jochen@topf.org> <jochen@remote.org>
 Jochen Topf <jochen@topf.org> <jochen@remote.org>