diff ChangeLog @ 29343:bf4a33bd020b

merge of '0990bc18c1ec4f05a29aeb8f55d4d28a08152cc6' and 'd5e93b05ae1a8f5296a0a9b069c630630285d3c3'

--- a/ChangeLog	Mon Dec 14 15:49:07 2009 +0000
+++ b/ChangeLog	Fri Dec 25 21:33:50 2009 +0000
@@ -19,6 +19,10 @@
 	  it look and behave like the search dialog in Firefox)
 
 version 2.6.5 (??/??/20??):
+	libpurple:
+	* TLS certificates are actually stored to the local cache once again
+	  (accepting a name mismatch on a certificate should now be remembered)
+
 	General:
 	* Build-time fixes for Solaris.  (Paul Townsend)
 
@@ -27,10 +31,12 @@
 	  Chinese characters (broken in 2.6.4)
 
 	MSN:
-	* File transfer requests will no longer cause a crash if you delete the file
-	  before the other side accepts.
-	* Recieved files will no longer hold an extra lock after completion, meaning
-	  they can be moved or deleted without complaints from your OS.
+	* File transfer requests will no longer cause a crash if you delete the
+	  file before the other side accepts.
+	* Recieved files will no longer hold an extra lock after completion,
+	  meaning they can be moved or deleted without complaints from your OS.
+	* Buddies who sign in from a second location will no longer cause an
+	  unnecessary chat window to open.
 
 	XMPP:
 	* Added support for the SCRAM-SHA-1 SASL mechanism.  This is only