Merge "RCFilters: set live update button title"

[lhc/web/wiklou.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index ae18878..2134fc5 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -412,6 +412,7 @@ Sucheta Ghoshal <sghoshal@wikimedia.org>
 Sumit Asthana <asthana.sumit23@gmail.com>
 TerraCodes <terracodes@tools.wmflabs.org>
 Thalia Chan <thalia@cantorion.org>
+Thalia Chan <thalia@cantorion.org> <thalia.e.chan@googlemail.com>
 Thiemo Mättig <thiemo.maettig@wikimedia.de>
 Thiemo Mättig <thiemo.maettig@wikimedia.de> <mr.heat@gmx.de>
 This, that and the other <at.light@live.com.au>
@@ -454,9 +455,9 @@ X! <soxred93@gmail.com> <soxred93@users.mediawiki.org>
 Yaron Koren <yaron57@gmail.com>
 Yaron Koren <yaron57@gmail.com> <yaron@users.mediawiki.org>
 Yaroslav Melnychuk <yaroslavmelnuchuk@gmail.com>
-Yongmin Hong <revi@member.fsf.org>
-Yongmin Hong <revi@member.fsf.org> <revi@pobox.com>
-Yongmin Hong <revi@member.fsf.org> <reviwiki@gmail.com>
+Yongmin Hong <revi@pobox.com>
+Yongmin Hong <revi@pobox.com> <revi@member.fsf.org>
+Yongmin Hong <revi@pobox.com> <reviwiki@gmail.com>
 Yuri Astrakhan <yurik@wikimedia.org>
 Yuri Astrakhan <yurik@wikimedia.org> <yuriastrakhan@gmail.com>
 Yuri Astrakhan <yurik@wikimedia.org> <yurik@users.mediawiki.org>