changeset 32550:f9650f6b636d

merge of 'd3c4fbebab720da0885766add6272f14814edc99' and 'deb06ab6aa118efb674f1a8434ff529e67b28809'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Thu, 23 Feb 2012 09:01:12 +0000
parents cebed34f92eb (diff) 3f81e3c3064c (current diff)
children c775aca73d75
files ChangeLog
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Feb 23 08:12:03 2012 +0000
+++ b/ChangeLog	Thu Feb 23 09:01:12 2012 +0000
@@ -24,8 +24,6 @@
 	MSN:
 	* Fix file transfer with older Mac MSN clients.
 	* Support file transfers up to ~9 EiB.
-	* Support new protocol version MSNP18. (#14753)
-	* Fix messages to offline contacts. (#14302)
 
 	MXit:
 	* Remove all reference to Hidden Number.
@@ -70,6 +68,8 @@
 	MSN:
 	* Fix possible crashes caused by not validating incoming messages as
 	  UTF-8. (Thijs Alkemade) (#14884)
+	* Support new protocol version MSNP18. (#14753)
+	* Fix messages to offline contacts. (#14302)
 
 	Windows-Specific Changes:
 	* Fix compilation of the Bonjour protocol plugin. (#14802)