pidgin: 2ba63306: I merged Paul Aurich (darkrain42)'s bran...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 2ba63306963eb1bfddbb853da79bd2d2e829af2d
Ancestor: 8ae2fca06a3be4b99cc677c8f880d9521a35ec8b
Author: markdoliner at pidgin.im
Date: 2009-01-28T10:27:53
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2ba63306963eb1bfddbb853da79bd2d2e829af2d

Modified files:
        ChangeLog

ChangeLog: 

I merged Paul Aurich (darkrain42)'s branch cpw.darkrain42.oscar.ssl branch
into trunk

-------------- next part --------------
============================================================
--- ChangeLog	256e2933978e764565acd28e12b5947db99bc811
+++ ChangeLog	c0ec991b3b5c7b3859ff2b4a53de3d5698e3ba42
@@ -2,10 +2,14 @@ version 2.5.5 (??/??/????):
 
 version 2.5.5 (??/??/????):
 	libpurple:
-	* Fix transfer of buddy icons, custom smileys and files from the
-	latest WLM 9 official client. (Thomas Gibson-Robinson)
+	* Fix transfer of buddy icons, custom smileys, and files from the
+	  latest Windows Live Messenger 9 official client. (Thomas
+	  Gibson-Robinson)
 	* Fix a crash when removing an account with an unknown protocol id.
 	* Large (multi-part) messages on MSN are now correctly re-combined.
+	* Beta support for SSL connections for AIM and ICQ accounts.  To
+	  enable, check the "Use SSL" option from the Advanced tab when
+	  editing your AIM or ICQ account. (Paul Aurich)
 
 	Finch:
 	* Allow rebinding keys to change the focused widget (details in the