From: Loic Dachary <loic@dachary.org>
Date: Fri, 22 Aug 2014 01:05:48 +0000 (+0200)
Subject: Merge pull request #2273 from dachary/wip-mailmap
X-Git-Tag: v0.86~229
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5234abfa223d1e68da4b6cc9ecd135a22b052823;p=ceph.git

Merge pull request #2273 from dachary/wip-mailmap

mailmap updates
---

5234abfa223d1e68da4b6cc9ecd135a22b052823