# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1250470184 0
# Node ID 6dc7f2e36f72aec6f471216a533906f7a4fb5fda
# Parent  1f2a9d38b8665ef9d6dc74846109405a766a72da
Pull in ChangeLog, ChangeLog.API, ChangeLog.win32, and NEWS entries from the
2.5.9 release and add a 2.5.9 section to po/ChangeLog since I forgot to do so
in the 2.5.9 release.

diff -r 1f2a9d38b866 -r 6dc7f2e36f72 ChangeLog
--- a/ChangeLog	Mon Aug 17 00:34:10 2009 +0000
+++ b/ChangeLog	Mon Aug 17 00:49:44 2009 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.6.0 (??/??/2009):
+version 2.6.0 (08/18/2009):
 	libpurple:
 	* Theme support in libpurple thanks to Justin Rodriguez's summer of code
 	  project, with some minor additions and cleanups from Paul Aurich.
@@ -206,6 +206,11 @@
 	* Preferences have been reorganized into three tabs for Colors, Fonts, and
 	  Miscellaneous categories.
 
+version 2.5.9 (08/18/2009):
+	* Fix a crash via a specially crafted MSN message (CVE-2009-2694).
+	* Fix a crash in Bonjour, MSN, and XMPP when trying to transfer files with
+	  NULL names.
+
 version 2.5.8 (06/27/2009):
 	ICQ:
 	* Fix misparsing a web message as an SMS message. (Yuriy Kaminskiy)
diff -r 1f2a9d38b866 -r 6dc7f2e36f72 ChangeLog.API
--- a/ChangeLog.API	Mon Aug 17 00:34:10 2009 +0000
+++ b/ChangeLog.API	Mon Aug 17 00:49:44 2009 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.6.0 (??/??/2009):
+version 2.6.0 (08/18/2009):
 	libpurple:
 		Added:
 		* PurpleMedia and PurpleMediaManager API
@@ -168,6 +168,9 @@
 			* Purple::Request::Field::string_new
 			* Purple::Request::Field::group_new
 
+version 2.5.9 (08/18/2009):
+	No changes
+
 version 2.5.8 (06/27/2009):
 	No changes
 
diff -r 1f2a9d38b866 -r 6dc7f2e36f72 ChangeLog.win32
--- a/ChangeLog.win32	Mon Aug 17 00:34:10 2009 +0000
+++ b/ChangeLog.win32	Mon Aug 17 00:49:44 2009 +0000
@@ -1,6 +1,9 @@
 version 2.6.0 (??/??/2009):
 	* Added XMPP URI support.
 
+version 2.5.9 (08/18/2009):
+	* No changes and no win32 packages built.
+
 version 2.5.8 (06/27/2009):
 	* No changes
 
diff -r 1f2a9d38b866 -r 6dc7f2e36f72 NEWS
--- a/NEWS	Mon Aug 17 00:34:10 2009 +0000
+++ b/NEWS	Mon Aug 17 00:49:44 2009 +0000
@@ -2,6 +2,10 @@
 
 Our development blog is available at: http://planet.pidgin.im
 
+2.5.9 (08/18/2009):
+	John:  This release is just a crash fix release to address a security
+	issue reported to us by CORE and a couple crashes Elliott found.
+
 2.5.8 (06/27/2009):
 	John:  This release is another somewhat rushed bugfix release to fix
 	a number of bugs that have come up since we released Pidgin 2.5.7.
diff -r 1f2a9d38b866 -r 6dc7f2e36f72 po/ChangeLog
--- a/po/ChangeLog	Mon Aug 17 00:34:10 2009 +0000
+++ b/po/ChangeLog	Mon Aug 17 00:49:44 2009 +0000
@@ -37,6 +37,9 @@
 	* Swahili translation added (Paul Msegeya)
 	* Swedish translation updated (Peter Hjalmarsson)
 
+version 2.5.9
+	* No changes
+
 version 2.5.8
 	* No changes