/pidgin/main: e5edb57e8562: Merge from release-2.x.y branch. Man...

[Mark Doliner]

Changeset: e5edb57e8562f087878b054ccda0aaff27950083
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2014-01-10 19:44 -0800
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/e5edb57e8562

Description:

Merge from release-2.x.y branch. Manually resolved minor conflict in ChangeLog.

diffstat:

 ChangeLog    |  53 ++++++++++++++++++++++++++++++++++++++++++++---------
 po/ChangeLog |   2 +-
 2 files changed, 45 insertions(+), 10 deletions(-)

diffs (83 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,23 +62,58 @@ version 3.0.0 (??/??/????):
 	* Ciphers are now built from the libpurple directory.
 
 version 2.10.8:
-	Stock market:
-	* Ludicrous increases on mediocre worldwide economic data.
-
 	General:
-	* Add support for Python3 in build scripts. (Ashish Gupta) (#15624)
+	* Python build scripts and example plugins are now compatible with
+	  Python 3. (Ashish Gupta) (#15624)
+
+	libpurple:
+	* Fix handling of SSL certificates without subjects when using libnss.
+	* Fix handling of SSL certificates with timestamps in the distant future
+	  when using libnss. (#15586)
 
 	Pidgin:
-	* Add a Unity integration plugin.
-
-	Gadu-Gadu:
-	* Disabled buddy list import/export from/to server (it didn't worked
-	  anymore). Buddy list synchronization will be implemented in 3.0.0.
+	* Better handling of URLs longer than 1000 letters.
+	* Fix handling of multibyte UTF-8 characters in smiley themes. (#15756)
 
 	Windows-Specific Changes:
+	* Fix Tcl scripts. (#15520)
+	* Fix crash-on-startup when ASLR is always on. (#15521)
 	* Updates to dependencies:
 		* NSS 3.15.3 and NSPR 4.10.2
 
+	Gadu-Gadu:
+	* Disabled buddy list import/export from/to server (it didn't work
+	  anymore). Buddy list synchronization will be implemented in 3.0.0.
+
+	IRC:
+	* Fix bug where initial IRC status would not be set correctly.
+	* Fix bug where IRC wasn't available when libpurple was compiled with
+	  Cyrus SASL support. (#15517)
+
+	MXit:
+	* Fix sporadic crashes that can happen after user is disconnected.
+	* Fix crash when attempting to add a contact via search results.
+	* Show error message if file transfer fails.
+	* Fix compiling with InstantBird.
+	* Fix display of some custom emoticons.
+
+	SILC:
+	* Correctly set whiteboard dimensions in whiteboard sessions.
+
+	XMPP:
+	* Fix possible crash or other erratic behavior when selecting a very
+	  small file for your own buddy icon.
+	* Fix crash if the user tries to initiate a voice/video session with a
+	  resourceless JID.
+	* Fix login errors when the first two available auth mechanisms fail but
+	  a subsequent mechanism would otherwise work when using Cyrus SASL.
+	  (#15524)
+
+	Plugins:
+	* Fix crash in contact availability plugin.
+	* Fix perl function Purple::Network::ip_atoi
+	* Add Unity integration plugin.
+
 version 2.10.7 (02/13/2013):
 	Alien hatchery:
 	* No changes
diff --git a/po/ChangeLog b/po/ChangeLog
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,7 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.10.8
-	No changes
+	* German translation updated (Björn Voigt, Jochen Kemnade)
 
 version 2.10.7
 	* Burmese translation updated (Thura Hlaing)