# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1194199186 0
# Node ID cb747d0f34576c98db2b0802b4e53049ad57c17d
# Parent  f3a995c30205482c4495f7a5e44c0b0d6dac59e1# Parent  2b8c00e81652958bd39a704dd85afc98b99f81b4
merge of '8efbae676804d160b330226a663aa241a8d6a78e'
     and '9711119df29a0928ae061bc0e4d34d750db51f23'

diff -r 2b8c00e81652 -r cb747d0f3457 pidgin/gtkaccount.c
diff -r 2b8c00e81652 -r cb747d0f3457 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Sun Nov 04 02:43:24 2007 +0000
+++ b/pidgin/gtkdialogs.c	Sun Nov 04 17:59:46 2007 +0000
@@ -147,7 +147,7 @@
 	{N_("Danish"),              "da", "Morten Brix Pedersen", "morten@wtf.dk"},
 	{N_("Danish"),              "da", "Peter Bach", "bach.peter@gmail.com"},
 	{N_("German"),              "de", "Björn Voigt", "bjoern@cs.tu-berlin.de"},
-	{N_("German"),              "de", "Jochen Kemnade", "kemnade@gmail.com"},
+	{N_("German"),              "de", "Jochen Kemnade", "jochenkemnade@web.de"},
 	{N_("Dzongkha"),            "dz", "Norbu", "nor_den@hotmail.com"},
 	{N_("Dzongkha"),            "dz", "Jurmey Rabgay", "jur_gay@yahoo.com"},
 	{N_("Dzongkha"),            "dz", "Wangmo Sherpa", "rinwanshe@yahoo.com"},
diff -r 2b8c00e81652 -r cb747d0f3457 pidgin/gtksavedstatuses.c
diff -r 2b8c00e81652 -r cb747d0f3457 pidgin/gtkutils.c