pidgin: 87f5b009: Fix ChangeLog after merge...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 87f5b009d71909e90d49a7e37fdfa1456c440ecd
Ancestor: 4b5d6b4371bfd8d48730643975d5ac68e10bc035
Author: malu at pidgin.im
Date: 2009-12-01T21:39:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/87f5b009d71909e90d49a7e37fdfa1456c440ecd

Modified files:
        ChangeLog

ChangeLog: 

Fix ChangeLog after merge...

-------------- next part --------------
============================================================
--- ChangeLog	6b19c6f54e1addf304d1f57729a503d6f9054335
+++ ChangeLog	ffe99bba67741d28470723a179c567a8b0e0f72b
@@ -1,10 +1,11 @@ version 2.6.5 (??/??/20??):
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.6.5 (??/??/20??):
-	libpurple:
-	* XMPP: when getting info on a domain-only (server) JID, show uptime
+	XMPP:
+	* When getting info on a domain-only (server) JID, show uptime
 	  (when given by the result of the "last query") and don't show status as
 	  offline.
+	* Do not crash when attempting to register for a new account on Windows.
 
 version 2.6.4 (11/29/2009):
 	libpurple: