# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1211738622 0
# Node ID ee4a2c56481d5e5a06126065bd7aa6cf7a7a0372
# Parent  fc8cc6b588098787c7bd1337ccd82e7863ad355d# Parent  40d3767fb1b9fb30dfece3712221b51a729b3285
merge of '64869f284f4934e2f05446fc3d50960b6296ad5b'
     and 'ff389b62b9d93369d7d6f96ca3e913c108d21523'

diff -r fc8cc6b58809 -r ee4a2c56481d AUTHORS
--- a/AUTHORS	Sun May 25 16:18:15 2008 +0000
+++ b/AUTHORS	Sun May 25 18:03:42 2008 +0000
@@ -8,14 +8,6 @@
 Current Developers:
 ------------------
 
-Sean Egan <seanegan@gmail.com> - Lead Developer
-	AIM: SeanEgn
-	ICQ: 96642211
-	Yahoo:	SeanEgn
-	MSN:  seanegn@hotmail.com
-	XMPP:  seanegn@jabber.org
-	Gadu-Gadu:  1511497
-
 Daniel 'datallah' Atallah - Developer
 John 'rekkanoryo' Bailey - Developer
 Ethan 'Paco-Paco' Blanton - Developer
@@ -23,6 +15,7 @@
 Ka-Hing Cheung - Developer
 Sadrul Habib Chowdhury - Developer
 Mark 'KingAnt' Doliner - Developer
+Sean Egan - Developer
 Casey Harkins - Developer
 Gary 'grim' Kramlich - Developer
 Richard 'rlaager' Laager - Developer
@@ -41,6 +34,7 @@
 
 Crazy Patch Writers:
 -------------------
+Felipe 'shx' Contreras
 Dennis 'EvilDennisR' Ristuccia
 Peter 'Fmoo' Ruibal
 Elliott 'QuLogic' Sales de Andrade
@@ -61,7 +55,6 @@
 
 Retired Crazy Patch Writers:
 ---------------------------
-Felipe 'shx' Contreras
 Decklin Foster
 Peter 'Bleeter' Lawler
 Robert 'Robot101' McQueen
diff -r fc8cc6b58809 -r ee4a2c56481d doc/pidgin.1.in
--- a/doc/pidgin.1.in	Sun May 25 16:18:15 2008 +0000
+++ b/doc/pidgin.1.in	Sun May 25 18:03:42 2008 +0000
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2000, Dennis Ristuccia <dennis@dennisr.net>
+Ri.\" Copyright (c) 2000, Dennis Ristuccia <dennis@dennisr.net>
 .\"
 .\" This is free documentation; you can redistribute it and/or
 .\" modify it under the terms of the GNU General Public License as
@@ -550,8 +550,6 @@
 .SH AUTHORS
 Pidgin's active developers are:
 .br
-  Sean Egan (lead developer) <\fIseanegan@gmail.com\fR>
-.br
   Daniel 'datallah' Atallah (developer)
 .br
   John 'rekkanoryo' Bailey (developer)
@@ -566,6 +564,8 @@
 .br
   Mark 'KingAnt' Doliner (developer) <\fIthekingant@users.sourceforge.net\fR>
 .br
+  Sean Egan (developer) <\fIseanegan@gmail.com\fR>
+.br
   Casey Harkins (developer)
 .br
   Gary 'grim' Kramlich (developer)
@@ -600,6 +600,8 @@
 
 Our crazy patch writers include:
 .br
+  Felipe 'shx' Contreras
+.br
   Dennis 'EvilDennisR' Ristuccia
 .br
   Peter 'fmoo' Ruibal
@@ -608,6 +610,8 @@
 .br
   Gabriel 'Nix' Schulhof
 .br
+  Jorge 'Masca' Villaseñor
+.br
 
 
 Our artists are:
@@ -640,8 +644,6 @@
 
 Our retired crazy patch writers include:
 .br
-  Felipe 'shx' Contreras
-.br
   Decklin Foster
 .br
   Peter 'Bleeter' Lawler
diff -r fc8cc6b58809 -r ee4a2c56481d pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Sun May 25 16:18:15 2008 +0000
+++ b/pidgin/gtkdialogs.c	Sun May 25 18:03:42 2008 +0000
@@ -67,9 +67,8 @@
 	char *email;
 };
 
-/* Order: Lead Developer, then Alphabetical by Last Name */
+/* Order: Alphabetical by Last Name */
 static const struct developer developers[] = {
-	{"Sean Egan",					N_("lead developer"), "sean.egan@gmail.com"},
 	{"Daniel 'datallah' Atallah",	N_("developer"), NULL},
 	{"John 'rekkanoryo' Bailey",	N_("developer"), NULL},
 	{"Ethan 'Paco-Paco' Blanton",	N_("developer"), NULL},
@@ -77,6 +76,7 @@
 	{"Ka-Hing Cheung",				N_("developer"), NULL},
 	{"Sadrul Habib Chowdhury",		N_("developer"), NULL},
 	{"Mark 'KingAnt' Doliner",		N_("developer"), NULL},
+	{"Sean Egan",					N_("developer"), "sean.egan@gmail.com"},
 	{"Casey Harkins",               N_("developer"),   NULL},
 	{"Gary 'grim' Kramlich",		N_("developer"), NULL},
 	{"Richard 'rlaager' Laager",	N_("developer"), NULL},