/pidgin/main: 0c3cedd3c16f: Merge.

[Mark Doliner]

Changeset: 0c3cedd3c16f8e42e9fa455d9ed04c99cdc2aea0
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2013-10-08 00:21 -0700
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/0c3cedd3c16f

Description:

Merge.

diffstat:

 pidgin/gtkdialogs.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -164,7 +164,7 @@ static const struct translator translato
 	{N_("Czech"),               "cs", "David Vachulka", "david at konstrukce-cad.com"},
 	{N_("Danish"),              "da", "Peter Bach", "bach.peter at gmail.com"},
 	{N_("Danish"),              "da", "Morten Brix Pedersen", "morten at wtf.dk"},
-	{N_("German"),              "de", "Björn Voigt", "bjoern at cs.tu-berlin.de"},
+	{N_("German"),              "de", "Björn Voigt", "bjoernv at arcor.de"},
 	{N_("Dzongkha"),            "dz", "Norbu", "nor_den at hotmail.com"},
 	{N_("Dzongkha"),            "dz", "Jurmey Rabgay", "jur_gay at yahoo.com"},
 	{N_("Dzongkha"),            "dz", "Wangmo Sherpa", "rinwanshe at yahoo.com"},