diff ChangeLog @ 30773:601d519fc6a2

merge of 'bada09db88dffa79646079f34fec29248989c618' and 'e7abe20448d307649f623c608ecd470060b5f40d'
author Mark Doliner <mark@kingant.net>
date Tue, 10 Aug 2010 05:01:27 +0000
parents 126317248aaa
children 7460ab6199fe
line wrap: on
line diff
--- a/ChangeLog	Tue Aug 10 05:01:21 2010 +0000
+++ b/ChangeLog	Tue Aug 10 05:01:27 2010 +0000
@@ -25,6 +25,8 @@
 	MSN:
 	* Support for web-based buddy icons, used when a buddy logs in to the
 	  messenger on the Live website.
+	* Fix file transfers with some clients that don't support direct
+	  connections (e.g., papyon, telepathy-butterfly, etc.) (#12150)
 
 	MXit:
 	* Fix filename for the Shocked emoticon. (#12364)