# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1210396829 0
# Node ID 780972e37f0ce3ad0913b3dbfb2f3864527d3d12
# Parent  e6674df4cbf1df91087282feeb7b3f3436d989fe# Parent  d214379806a552c974452254686e5b587d58abb1
merge of '99687ce6fa955d1d32092992b65de140dc944ab0'
     and 'd26b1eaa92aaac0a6de151a429c6b7a3bf5bd241'

diff -r e6674df4cbf1 -r 780972e37f0c AUTHORS
--- a/AUTHORS	Sat May 10 05:15:58 2008 +0000
+++ b/AUTHORS	Sat May 10 05:20:29 2008 +0000
@@ -45,6 +45,7 @@
 Peter 'Fmoo' Ruibal
 Elliott 'QuLogic' Sales de Andrade
 Gabriel 'Nix' Schulhof
+Jorge 'Masca' Villaseñor
 
 Retired Developers:
 ------------------
diff -r e6674df4cbf1 -r 780972e37f0c pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Sat May 10 05:15:58 2008 +0000
+++ b/pidgin/gtkdialogs.c	Sat May 10 05:20:29 2008 +0000
@@ -102,6 +102,7 @@
 	{"Peter 'Fmoo' Ruibal",		NULL,	NULL},
 	{"Elliott 'QuLogic' Sales de Andrade",	NULL,	NULL},
 	{"Gabriel 'Nix' Schulhof", 	NULL, 	NULL},
+	{"Jorge 'Masca' Villaseñor", 	NULL, 	NULL},
 	{NULL, NULL, NULL}
 };