# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1194201141 0
# Node ID 93e674197822aed735eb41dfd82d3b3c5017b833
# Parent  f3a995c30205482c4495f7a5e44c0b0d6dac59e1# Parent  848e8bb7c975acb8fe7dcd1c6ca5e1cb49b74bda
merge of '8efbae676804d160b330226a663aa241a8d6a78e'
     and 'ede8595c50d5172b15365ffcff7a2b7748269bc7'

diff -r 848e8bb7c975 -r 93e674197822 pidgin/gtkaccount.c
diff -r 848e8bb7c975 -r 93e674197822 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Sun Nov 04 18:32:14 2007 +0000
+++ b/pidgin/gtkdialogs.c	Sun Nov 04 18:32:21 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 848e8bb7c975 -r 93e674197822 pidgin/gtksavedstatuses.c
diff -r 848e8bb7c975 -r 93e674197822 pidgin/gtkutils.c