Merge branch 'cc/mailmap-tuxfamily'

* cc/mailmap-tuxfamily:
.mailmap: use Christian Couder's Tuxfamily address

diff --git a/.mailmap b/.mailmap
index a714e69a11f59576a24487d05f8422f792edd9f0..9441a54b0d5b89ea2c795f8f6ad8a99dfbe8b432 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -33,6 +33,7 @@ Cheng Renquan <crquan@gmail.com>
 Chris Shoemaker <c.shoemaker@cox.net>
 Chris Wright <chrisw@sous-sol.org> <chrisw@osdl.org>
 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>
 Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
 Dan Johnson <computerdruid@gmail.com>