Merge pull request #9301 from objoo/YD-mailmap-updates-MAY3

author Loic Dachary <loic@dachary.org>

Mon, 29 Aug 2016 08:59:52 +0000 (10:59 +0200)

committer GitHub <noreply@github.com>

Mon, 29 Aug 2016 08:59:52 +0000 (10:59 +0200)
author Loic Dachary <loic@dachary.org>
Mon, 29 Aug 2016 08:59:52 +0000 (10:59 +0200)
committer GitHub <noreply@github.com>
Mon, 29 Aug 2016 08:59:52 +0000 (10:59 +0200)
diff --cc .mailmap
Simple merge
diff --cc .organizationmap
Simple merge
author	Loic Dachary <loic@dachary.org>
	Mon, 29 Aug 2016 08:59:52 +0000 (10:59 +0200)
committer	GitHub <noreply@github.com>
	Mon, 29 Aug 2016 08:59:52 +0000 (10:59 +0200)
		1	2
.mailmap	patch \|	diff1 \|	diff2 \|	blob \| history
.organizationmap	patch \|	diff1 \|	diff2 \|	blob \| history