# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1233138473 0
# Node ID 0e2731b9875c168d497eb54d58874ced71ed56b2
# Parent  29f953732186db6b506b88315fa6a624e844c0b0
I merged Paul Aurich (darkrain42)'s branch cpw.darkrain42.oscar.ssl branch
into trunk

diff -r 29f953732186 -r 0e2731b9875c ChangeLog
--- a/ChangeLog	Wed Jan 28 04:27:01 2009 +0000
+++ b/ChangeLog	Wed Jan 28 10:27:53 2009 +0000
@@ -2,10 +2,14 @@
 
 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