changeset 31005:016b15f13443

merge of '6c7b27abd37198a7bf98e9255299159259bcffc7' and 'bdb5fe6e0e06c8f8275aff942d31b2d4359487bb'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 21 Sep 2010 04:37:26 +0000
parents 621182ecbfda (current diff) a0a90f71275c (diff)
children 22a713532200
files ChangeLog
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Sep 20 19:54:46 2010 +0000
+++ b/ChangeLog	Tue Sep 21 04:37:26 2010 +0000
@@ -10,6 +10,9 @@
 	* Fall back to an ordinary request if a UI does not support showing a
 	  request with an icon.  Fixes receiving MSN file transfer requests
 	  including a thumbnail in Finch.
+	* Fix an invalid memory access when removing UPnP mappings that could
+	  cause sporadic crashes, most notably when MSN Direct Connections are
+	  enabled. (#12387)
 
 	Pidgin:
 	* Add support for the Gadu-Gadu protocol in the gevolution plugin to