pidgin: 107c37a9: Grab changes from the 2.6.3 branch

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 107c37a99cb9d098f7525cb27c7f3361805c09f2
Ancestor: 74321cb3411331d901a7a8a0dfe259f8239b4a2e
Author: markdoliner at pidgin.im
Date: 2009-10-16T09:33:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/107c37a99cb9d098f7525cb27c7f3361805c09f2

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS po/ChangeLog

ChangeLog: 

Grab changes from the 2.6.3 branch

-------------- next part --------------
============================================================
--- ChangeLog	804cf6051473fe8d72c5795f564a47321495acfb
+++ ChangeLog	d91e1f2dc3b4e8b2a26d677f03b8cb0ac0a92b4a
@@ -1,17 +1,12 @@ Pidgin and Finch: The Pimpin' Penguin IM
 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 @@ version 2.6.3 (??/??/20??):
 	* 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
============================================================
--- ChangeLog.API	f82239302e8f2f3cc93d1567155474ad98241222
+++ ChangeLog.API	160028f9819c6d7e1d69993acda47dca0cd3f9ff
@@ -1,5 +1,8 @@ Pidgin and Finch: The Pimpin' Penguin IM
 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:
============================================================
--- ChangeLog.win32	e21d127b5de56265323150746112f0e55f0c4a80
+++ ChangeLog.win32	2093ee83765fcdcc7a6ce7ebac3c428a9b3a1ad1
@@ -1,3 +1,6 @@
+version 2.6.3 (10/16/2009):
+	* No changes
+
 version 2.6.2 (09/05/2009):
 	* No changes
 
============================================================
--- NEWS	1ce239fe4cc1ad79630a4cde1d7ac6b1be5e76b3
+++ NEWS	eadd57d06bff44aca2d42d95918af0ced78ef881
@@ -2,6 +2,11 @@ Our development blog is available at: ht
 
 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
============================================================
--- po/ChangeLog	3050ba357549a71554d662f6d7c57dea69f670b8
+++ po/ChangeLog	f993cb719b4b09aa5cfa812796704c31818ac593
@@ -1,8 +1,11 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.6.3
+version 2.6.4
 	* Vietnamese translation updated (Clytie Siddall)
 
+version 2.6.3
+	* No changes
+
 version 2.6.2
 	* Afrikaans translation updated (Friedel Wolff)
 	* Albanian translation updated (Besnik Bleta)