Merge branch 'maint'

[git.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 3b2ce578a1a02a86d7a1f0b66b5ea5e51472033b..1f729c223ce8ec6f913a36497f0c32b7bba67819 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@
 #
 
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
+Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
 Chris Shoemaker <c.shoemaker@cox.net>
 Dana L. How <danahow@gmail.com>
 Dana L. How <how@deathvalley.cswitch.com>