From: Loic Dachary <loic@dachary.org>
Date: Wed, 6 Aug 2014 15:23:17 +0000 (+0200)
Subject: Merge pull request #2165 from dachary/wip-mailmap
X-Git-Tag: v0.85~88
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b416446cb96e68e13c077822bae9190ea79ecd25;p=ceph.git

Merge pull request #2165 from dachary/wip-mailmap

mailmap updates
---

b416446cb96e68e13c077822bae9190ea79ecd25