diff ChangeLog @ 32802:fa666e7f747e

propagate from branch 'im.pidgin.pidgin.2.x.y' (head 55372aac7eca74e2a3121931b867702d2fdfe299) to branch 'im.pidgin.pidgin' (head 1f233991b11d30d7bd9d1e058e19fe162a9600f3)

--- a/ChangeLog	Fri May 25 19:28:41 2012 +0000
+++ b/ChangeLog	Fri May 25 19:41:04 2012 +0000
@@ -47,8 +47,34 @@
 	* The Offline Message Emulation plugin now adds a note that the message
 	  was an offline message. (Flavius Anton) (#2497)
 
-version 2.10.4:
-	TODO
+version 2.10.5:
+	No changes
+
+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
+	  much kinder to the network.
+	* 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! (CVE-2012-2318)
+
+	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: