From a2ed61ee663dcdb61b985bbae07e9046bb93f503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= <paul@oshannessy.com>
Date: Tue, 1 Apr 2014 09:30:08 -0700
Subject: [PATCH] Update mailmap post 0.10 (see #1283)

---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 040be2e5cc..73c4433acc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@ Connor McSheffrey <c@conr.me> <connor.mcsheffrey@gmail.com>
 Dan Schafer <dschafer@fb.com>
 Evan Coonrod <evan@paloalto.com>
 Fabio M. Costa <fabiomcosta@gmail.com> <fabs@fb.com>
+François-Xavier Bois <fxbois@gmail.com>
 Harry Hull <harry.hull1@gmail.com>
 Ingvar Stepanyan <me@rreverser.com> <rreverser@ubuntu.rreverser.a4.internal.cloudapp.net>
 Jaime Mingo <j.mingov@3boll.com>