# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1255685602 0
# Node ID 31ff586b8ddc32b875a392fa53ed705b842a3315
# Parent  e5940c163004d939a61de57a070a08812b871c25
Grab changes from the 2.6.3 branch

diff -r e5940c163004 -r 31ff586b8ddc ChangeLog
--- a/ChangeLog	Fri Oct 16 09:07:25 2009 +0000
+++ b/ChangeLog	Fri Oct 16 09:33:22 2009 +0000
@@ -1,17 +1,12 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.6.3 (??/??/20??):
+version 2.6.4 (??/??/20??):
 	General:
 	* New 'plugins' sub-command to 'debug' command (i.e. '/debug plugins')
 	  to announce the list of loaded plugins (in both Finch and Pidgin).
-	* Fix a crash when performing DNS queries on Unixes that use the
-	  blocking DNS lookups.  (Brian Lu)
 	* Fix building the GnuTLS plugin with older versions of GnuTLS.
 	* Fix DNS TXT query resolution.
 
-	AIM and ICQ:
-	* Fix blocking and other privacy lists.  (Thanks to AOL)
-
 	XMPP:
 	* Users connecting to Google Talk now have an "Initiate Chat" context menu
 	  option for their buddies.  (Eion Robb)
@@ -37,6 +32,16 @@
 	* The userlist in a multiuser chat can be styled via gtkrc by using the
 	  widget name "pidgin_conv_userlist". (Heiko Schmitt)
 
+version 2.6.3 (10/16/2009):
+	General:
+	* Fix a crash when performing DNS queries on Unixes that use the
+	  blocking DNS lookups.  (Brian Lu)
+
+	AIM and ICQ:
+	* Fix a crash when some clients send contacts in a format we don't
+	  understand.
+	* Fix blocking and other privacy lists.  (Thanks to AOL)
+
 version 2.6.2 (09/05/2009):
 	libpurple:
 	* Fix --disable-avahi to actually disable it in configure, as opposed
diff -r e5940c163004 -r 31ff586b8ddc ChangeLog.API
--- a/ChangeLog.API	Fri Oct 16 09:07:25 2009 +0000
+++ b/ChangeLog.API	Fri Oct 16 09:33:22 2009 +0000
@@ -1,5 +1,8 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.6.3 (10/16/2009):
+	No changes
+
 version 2.6.2 (09/05/2009):
 	Perl:
 		Added:
diff -r e5940c163004 -r 31ff586b8ddc ChangeLog.win32
--- a/ChangeLog.win32	Fri Oct 16 09:07:25 2009 +0000
+++ b/ChangeLog.win32	Fri Oct 16 09:33:22 2009 +0000
@@ -1,3 +1,6 @@
+version 2.6.3 (10/16/2009):
+	* No changes
+
 version 2.6.2 (09/05/2009):
 	* No changes
 
diff -r e5940c163004 -r 31ff586b8ddc NEWS
--- a/NEWS	Fri Oct 16 09:07:25 2009 +0000
+++ b/NEWS	Fri Oct 16 09:33:22 2009 +0000
@@ -2,6 +2,11 @@
 
 Our development blog is available at: http://planet.pidgin.im
 
+2.6.3 (10/16/2009):
+	Mark: Someone reported a fairly serious bug in our AIM/ICQ code
+	so we're releasing a special "severe bug fix only" build.  See the
+	ChangeLog for details.  Enjoy!
+
 2.6.2 (09/05/2009):
 	Mark: Woo boy it's been a busy two weeks.  There was a lot of new code
 	in 2.6.0, and with new code comes new bugs.  The cadre of relentless
diff -r e5940c163004 -r 31ff586b8ddc po/ChangeLog
--- a/po/ChangeLog	Fri Oct 16 09:07:25 2009 +0000
+++ b/po/ChangeLog	Fri Oct 16 09:33:22 2009 +0000
@@ -1,7 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.6.4
+	* Vietnamese translation updated (Clytie Siddall)
+
 version 2.6.3
-	* Vietnamese translation updated (Clytie Siddall)
+	* No changes
 
 version 2.6.2
 	* Afrikaans translation updated (Friedel Wolff)