# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1285043846 0
# Node ID 016b15f13443802811178ec3179b9dcfe417ce0f
# Parent  621182ecbfda256bda8c9eecaddffd0eeb55565c# Parent  a0a90f71275c57ef1af85cda77b65c506196cb8d
merge of '6c7b27abd37198a7bf98e9255299159259bcffc7'
     and 'bdb5fe6e0e06c8f8275aff942d31b2d4359487bb'

diff -r 621182ecbfda -r 016b15f13443 ChangeLog
--- 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