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

[chef.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index b77ecd89b0d67698aa9110b0655d282d4d2c44aa..90f166d5b9fab3b4f4b2d6ad5fc35d92eea916da 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,3 @@
 Grant Slater <openstreetmap@firefishy.com> <git@firefishy.com>
+Guillaume Rischard <git@stereo.lu> <github@stereo.lu>
 Jochen Topf <jochen@topf.org> <jochen@remote.org>