From: Loic Dachary <loic@dachary.org>
Date: Mon, 23 Nov 2015 22:31:06 +0000 (+0100)
Subject: Merge pull request #6495 from objoo/master
X-Git-Tag: v10.0.1~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16b6f7ac052e4ea559d19a01908ee09dd836ab13;p=ceph.git

Merge pull request #6495 from objoo/master

Mailmap updates for infernalis.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

16b6f7ac052e4ea559d19a01908ee09dd836ab13