# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1198015930 0
# Node ID af389f2537ad55a7b030335a102d26ce4756c3ed
# Parent  39b078ac8a81064002297928828637beb89fe513# Parent  622a96f78a9ce07b92a3ff0fd1062b1993421bce
merge of '70b3c6fe54dd2678b33b1b1da78c4e66acd20931'
     and 'f24be9cb8ea385acbcd053e528efbd2bb31b8b1d'

diff -r 39b078ac8a81 -r af389f2537ad pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Tue Dec 18 21:43:03 2007 +0000
+++ b/pidgin/gtkdialogs.c	Tue Dec 18 22:12:10 2007 +0000
@@ -89,6 +89,7 @@
 	{"Megan 'Cae' Schneider",       N_("support/QA"), NULL},
 	{"Evan Schoenberg",		N_("developer"), NULL},
 	{"Kevin 'SimGuy' Stange",	N_("developer & webmaster"),	NULL},
+	{"Will 'resiak' Thompson",	NULL,	NULL},
 	{"Stu 'nosnilmot' Tomlinson",	N_("developer"), NULL},
 	{"Nathan 'faceprint' Walp",		N_("developer"), NULL},
 	{NULL, NULL, NULL}
@@ -99,7 +100,7 @@
 	{"Dennis 'EvilDennisR' Ristuccia",	N_("Senior Contributor/QA"),	NULL},
 	{"Peter 'Fmoo' Ruibal",		NULL,	NULL},
 	{"Gabriel 'Nix' Schulhof", 	NULL, 	NULL},
-	{"Will 'resiak' Thompson",	NULL,	NULL},
+	{"Elliott Sales de Andrade",	NULL,	NULL},
 	{NULL, NULL, NULL}
 };