Merge branch 'sg/rebase-progress' into maint

[thirdparty/git.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 247a3deb7e1418f0fdcfd9719cb7f609775d2804..82cd0569d51d0a2d69b013a3322b6d5985a1927c 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -40,6 +40,8 @@ Cord Seele <cowose@gmail.com> <cowose@googlemail.com>
 Christian Couder <chriscool@tuxfamily.org> <christian.couder@gmail.com>
 Christian Stimming <stimming@tuhh.de> <chs@ckiste.goetheallee>
 Christopher Díaz Riveros <chrisadr@gentoo.org> Christopher Diaz Riveros
+Clemens Buchacher <drizzd@gmx.net> <drizzd@aon.at>
+Clemens Buchacher <drizzd@gmx.net> <clemens.buchacher@intel.com>
 Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
 Dan Johnson <computerdruid@gmail.com>
 Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>