# HG changeset patch
# User Marcus Lundblad <malu@pidgin.im>
# Date 1259703558 0
# Node ID d3b52d0138c7e56066a08b35f16f4483b63562e8
# Parent  4f0b93e88feaab543fbebd41d932b8f01adb11c4
Fix ChangeLog after merge...

diff -r 4f0b93e88fea -r d3b52d0138c7 ChangeLog
--- a/ChangeLog	Tue Dec 01 21:36:55 2009 +0000
+++ b/ChangeLog	Tue Dec 01 21:39:18 2009 +0000
@@ -1,10 +1,11 @@
 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: