# HG changeset patch
# User Jochen Kemnade <jochenkemnade@web.de>
# Date 1193997564 0
# Node ID dd95454ddf902852a54a14b377c84852c8f08850
# Parent  98633d62ec87b6161b601178f04af28f80a2bf9c# Parent  0f4a5ff5dc844267f21444f6f341e1ff13364280
merge of '7c9f2e0cc4967a3eaade95d32f164349b6d1aa03'
     and 'fc4350a15fdd1f51b4496568afaa83355e18b714'

diff -r 98633d62ec87 -r dd95454ddf90 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Fri Nov 02 09:57:49 2007 +0000
+++ b/pidgin/gtkdialogs.c	Fri Nov 02 09:59:24 2007 +0000
@@ -71,6 +71,7 @@
 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},
 	{"Thomas Butter",				N_("developer"), NULL},
 	{"Ka-Hing Cheung",				N_("developer"), NULL},
@@ -95,7 +96,6 @@
 
 /* Order: Alphabetical by Last Name */
 static const struct developer patch_writers[] = {
-	{"John 'rekkanoryo' Bailey",	NULL,	NULL},
 	{"Dennis 'EvilDennisR' Ristuccia",	N_("Senior Contributor/QA"),	NULL},
 	{"Peter 'Fmoo' Ruibal",		NULL,	NULL},
 	{"Gabriel 'Nix' Schulhof", 	NULL, 	NULL},