# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1210390791 0
# Node ID d214379806a552c974452254686e5b587d58abb1
# Parent  4f6040bb6f7a8e285ff1800abc4f9f988905b483# Parent  395ced2d98cc2a61f68f18209916f4e203d1bd37
merge of '5800923dc413a26c68576e06ea89148d645fa4a9'
     and '9031d840e937ccce30f2565df8ffc0b290f513b8'

diff -r 4f6040bb6f7a -r d214379806a5 AUTHORS
--- a/AUTHORS	Sat May 10 03:32:58 2008 +0000
+++ b/AUTHORS	Sat May 10 03:39:51 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 4f6040bb6f7a -r d214379806a5 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Sat May 10 03:32:58 2008 +0000
+++ b/pidgin/gtkdialogs.c	Sat May 10 03:39:51 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}
 };