# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1273865719 0
# Node ID 2aaa31c7046fa384d38a194c28eaaa9690b9a155
# Parent  859bb4ab3efe54d015fcdef9c15372694dcc0d17
I propagated im.pidgin.soc.2010.icq-tlc to im.pidgin.pidgin.  This includes
Ivan Komarov's fix for HTML being displayed on incoming messages from ICQ 6.5
and various other clients.  Ivan is our ICQ TLC summer of code student.

Thanks, Ivan!

Refs #11836

diff -r 859bb4ab3efe -r 2aaa31c7046f COPYRIGHT
--- a/COPYRIGHT	Fri May 14 19:30:09 2010 +0000
+++ b/COPYRIGHT	Fri May 14 19:35:19 2010 +0000
@@ -250,6 +250,7 @@
 Krzysztof Klinikowski
 Akuke Kok
 Kir Kolyshkin
+Ivan Komarov
 F.W. Kong
 Konstantin Korikov
 Cole Kowalski
diff -r 859bb4ab3efe -r 2aaa31c7046f ChangeLog
--- a/ChangeLog	Fri May 14 19:30:09 2010 +0000
+++ b/ChangeLog	Fri May 14 19:35:19 2010 +0000
@@ -4,6 +4,9 @@
 	Bonjour:
 	* Fix a crash on disconnect.
 
+	ICQ:
+	* Fix bug that caused HTML to be displayed in incoming messages.
+
 	MSN:
 	* Fix unnecessary bandwidth consumption for buddy icon requests when
 	  buddies have capital letters in their passport addresses.