Merge pull request opencontainers#924 from wking/mailmap

.mailmap: Consolidate James' entries
kinvolk · Sep 27, 2017 · a812559 · a812559
2 parents f09dac8 + 8a16f08
commit a812559
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.mailmap b/.mailmap
@@ -7,6 +7,7 @@ Brandon Philips <brandon@ifup.org> <brandon@ifup.co>
 ChengTiesheng <chengtiesheng@huawei.com>
 Daniel, Dao Quang Minh <dqminh89@gmail.com>
 Doug Davis <dug@us.ibm.com> <duglin@users.noreply.github.com>
+James O. D. Hunt <james.o.hunt@intel.com>
 John Howard <jhoward@microsoft.com> <John.Howard@microsoft.com>
 LinZhinan(Zen Lin) <linzhinan@huawei.com>
 Mrunal Patel <mrunalp@gmail.com> <mrunal@Mrunals-iMac.local>