From: Loic Dachary Date: Wed, 8 Jan 2014 11:13:20 +0000 (-0800) Subject: Merge pull request #1055 from kri5/master X-Git-Tag: v0.77~39 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6adf5970819d1487cfdd8c80047f83908666954;p=ceph.git Merge pull request #1055 from kri5/master mailmap: Adds Christophe Courtaut git shortlog -nes shows only one Christophe Courtaut proof that the .mailmap addition is working. Reviewed-by: Loic Dachary --- b6adf5970819d1487cfdd8c80047f83908666954