# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1252041756 0
# Node ID 89f9e7c65365a0d10ef0779999f57efcf8747667
# Parent  18d299472a97a8f00d82f5f2c4d77233242a2419# Parent  0066067ddb182aad1db67d528bb8bfbfee227e52
merge of '143f0731ba083b48ae06f957fa8ae2ae4d3a9edb'
     and 'a264bb34c8bb53aea40fe09255b897fdaefb1311'

diff -r 18d299472a97 -r 89f9e7c65365 ChangeLog
--- a/ChangeLog	Fri Sep 04 05:20:55 2009 +0000
+++ b/ChangeLog	Fri Sep 04 05:22:36 2009 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.6.2 (??/??/2009):
+version 2.6.2 (09/04/2009):
 	libpurple:
 	* Fix --disable-avahi to actually disable it in configure, as opposed
 	  to just making the warning non-fatal.
diff -r 18d299472a97 -r 89f9e7c65365 ChangeLog.API
--- a/ChangeLog.API	Fri Sep 04 05:20:55 2009 +0000
+++ b/ChangeLog.API	Fri Sep 04 05:22:36 2009 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.6.2 (09/??/2009):
+version 2.6.2 (09/04/2009):
 	Perl:
 		Added:
 		* Purple::XMLNode::get_next(), which returns the next neighbor tag of
diff -r 18d299472a97 -r 89f9e7c65365 ChangeLog.win32
--- a/ChangeLog.win32	Fri Sep 04 05:20:55 2009 +0000
+++ b/ChangeLog.win32	Fri Sep 04 05:22:36 2009 +0000
@@ -1,3 +1,6 @@
+version 2.6.2 (09/04/2009):
+	* No changes
+
 version 2.6.1 (08/18/2009):
 	* No changes
 
diff -r 18d299472a97 -r 89f9e7c65365 NEWS
--- a/NEWS	Fri Sep 04 05:20:55 2009 +0000
+++ b/NEWS	Fri Sep 04 05:22:36 2009 +0000
@@ -2,6 +2,13 @@
 
 Our development blog is available at: http://planet.pidgin.im
 
+2.6.2 (09/04/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
+	developers responsible for Pidgin have been hard at work, and I believe
+	they have fixed all the major bugs that cropped up.  My thanks to all
+	those names listed as Current Developers in Pidgin's 'About' window.
+
 2.6.1 (08/18/2009):
 	Mark: There were a lot of changes in 2.6.0, and so a few major bugs
 	crept in.  This is a very minor release to fix those bugs.  Sorry for