/pidgin/main: 0efdb7833dee: Merge release-2.x.y branch into defa...

[Mark Doliner]

Changeset: 0efdb7833dee879393890ab52befa7a343c204dd
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2014-02-01 17:41 -0800
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/0efdb7833dee

Description:

Merge release-2.x.y branch into default.

Clean merge, apart from the .tx/config change that we don't want here.

diffstat:

 po/ChangeLog |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff --git a/po/ChangeLog b/po/ChangeLog
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,7 +1,8 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.10.9
-	* No changes
+	* German translation updated (Björn Voigt, Jochen Kemnade)
+	* Spanish translation updated (Javier Fernández-Sanguino Peña)
 
 version 2.10.8
 	* Albanian translation updated (Besnik Bleta)