# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1336360732 0
# Node ID e0db1e03afa0c8c6514c57302d7a489bbe6f03a1
# Parent  aacfb71133cc8eafd2a4b88d87143e0c1b957e87
Add ChangeLog entries for the two security fixes and a few other things.

diff -r aacfb71133cc -r e0db1e03afa0 ChangeLog
--- a/ChangeLog	Mon May 07 03:18:08 2012 +0000
+++ b/ChangeLog	Mon May 07 03:18:52 2012 +0000
@@ -1,6 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.10.4:
+version 2.10.4 (05/06/2012):
+	General:
+	* Support building against Farstream in addition to Farsight.
+	  (Olivier Crete) (#14936)
+
 	IRC:
 	* Disable periodic WHO timer.  IRC channel user lists will no
 	  longer automatically display away status, but libpurple will be
@@ -8,6 +12,20 @@
 	* Print unknown numerics to channel windows if we can associate
 	  them.  Thanks to Marien Zwart. (#15090)
 
+	MSN:
+	* Fix a possible crash when receiving messages with certain characters
+	  or character encodings.  Thanks to Fabian Yamaguchi for reporting
+	  this!
+
+	XMPP:
+	* Fix a possible crash when receiving a series of specially crafted
+	  file transfer requests.  Thanks to José Valentín Gutiérrez for
+	  reporting this!  (CVE-2012-2214)
+
+	Windows-Specific Changes:
+	* Words added to spell check dictionaries are saved across restarts of
+	  Pidgin (#11886)
+
 version 2.10.3 (03/26/2012):
 	MSN:
 	* Fix buddies not going offline. (#14997)