Merge branch 'sp/cvsexport'

[git.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 17e89af11847381cf6c5c21344fb09eec8776b34..4e0615e9beb06928e9440e3dd60014cc265f9ee5 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -35,7 +35,11 @@ Shawn O. Pearce <spearce@spearce.org>
 Theodore Ts'o <tytso@mit.edu>
 Tony Luck <tony.luck@intel.com>
 Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
+Uwe Kleine-König <Uwe_Zeisberger@digi.com>
+Uwe Kleine-König <uzeisberger@io.fsforth.de>
+Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Ville Skyttä <scop@xemacs.org>
 YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
 anonymous <linux@horizon.com>
 anonymous <linux@horizon.net>
+Dana L. How <how@deathvalley.cswitch.com>