# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1279685273 0
# Node ID afa721f12561c5f05d5650e43347be7df42d589a
# Parent  5884388dfd065b42e0db3e9b1fbfd8f0b96d3e15
Grab changes from the 2.7.2 branch

diff -r 5884388dfd06 -r afa721f12561 ChangeLog
--- a/ChangeLog	Wed Jul 21 02:57:51 2010 +0000
+++ b/ChangeLog	Wed Jul 21 04:07:53 2010 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.7.2 (??/??/????):
+version 2.7.3 (??/??/????):
 	General:
 	* Use silent build rules for automake >1.11. You can enable verbose
 	  builds with the --disable-silent-rules configure option, or using
@@ -46,6 +46,18 @@
 	* Fix file transfers that get stuck with "Waiting for transfer to
 	  begin".
 
+version 2.7.2 (07/21/2010):
+	AIM and ICQ:
+	* Fix a crash bug related to X-Status messages that can be triggered by
+	  remove users.  This is CVE-2010-2528.
+	* Fix a rare crash bug caused by certain incoming SMS messages
+	  (discovered by Jan Kaluza--thanks Jan!).
+	* Change HTML sent from ICQ accounts so that official ICQ clients
+	  hopefully display it correctly.
+
+	MSN:
+	* Fix a crash related to fast buddy icon transfers.
+
 version 2.7.1 (05/29/2010):
 	General:
 	* Build fixes on OpenSolaris.  (Brian Lu)
diff -r 5884388dfd06 -r afa721f12561 ChangeLog.API
--- a/ChangeLog.API	Wed Jul 21 02:57:51 2010 +0000
+++ b/ChangeLog.API	Wed Jul 21 04:07:53 2010 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.7.2 (??/??/????):
+version 2.7.3 (??/??/????):
 	libpurple:
 		Fixed:
 		* purple_account_[gs]et_public_alias no longer crash when
@@ -24,6 +24,9 @@
 		  gnt_tree_row_get_prev, gnt_tree_row_get_child and
 		  gnt_tree_row_get_parent.
 
+version 2.7.2 (07/21/2010):
+	* No changes
+
 version 2.7.1 (05/29/2010):
 	* No changes
 
diff -r 5884388dfd06 -r afa721f12561 ChangeLog.win32
--- a/ChangeLog.win32	Wed Jul 21 02:57:51 2010 +0000
+++ b/ChangeLog.win32	Wed Jul 21 04:07:53 2010 +0000
@@ -1,6 +1,12 @@
 Starting with Pidgin version 2.7.1, this ChangeLog file will no longer be
 updated.  It will be kept in the source tree for historical reasons only.
 
+version 2.7.2 (07/21/2010):
+	* No changes
+
+version 2.7.1 (05/29/2010):
+	* No changes
+
 version 2.7.0 (05/12/2010):
 	* Updated GTK+ to 2.16.6
 	* Private GTK+ Runtime now used (GTK+ Installer no longer supported)
diff -r 5884388dfd06 -r afa721f12561 NEWS
--- a/NEWS	Wed Jul 21 02:57:51 2010 +0000
+++ b/NEWS	Wed Jul 21 04:07:53 2010 +0000
@@ -2,6 +2,11 @@
 
 Our development blog is available at: http://planet.pidgin.im
 
+2.7.2 (07/21/2010):
+	Mark: We discovered a security issue in Pidgin 2.7.0 and 2.7.1 and
+	decided to release a patched version quickly.  This release contains
+	the fix for that crash, and a few other minor fixes.
+
 2.7.1 (05/29/2010):
 	Elliott: Hey, I'm first!  How did that happen?!  Maybe because of the
 	interesting changes in this release.  Sure there were quite a few bug
@@ -12,7 +17,7 @@
 	previous release!  This fixes a number of bugs that you've all been
 	reporting a ton of duplicate tickets about and even gives you the new
 	direct connection file transfer support for MSN.  Enjoy!
-	
+
 	Marcus: Quite a bit quicker to get this release out, compared with the
 	previous one :).  Fixes a number of bugs, and I'm sure the MSN direct
 	connections will please many users.  Enjoy!
diff -r 5884388dfd06 -r afa721f12561 po/ChangeLog
--- a/po/ChangeLog	Wed Jul 21 02:57:51 2010 +0000
+++ b/po/ChangeLog	Wed Jul 21 04:07:53 2010 +0000
@@ -1,5 +1,8 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.7.2
+	* No changes
+
 version 2.7.1
 	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R.
 	  Liu)