# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1329608598 0
# Node ID e374fea71214db6a82c2f672b5ccfaccce41fd1b
# Parent  70da0f9007b5745c7e6cb8989f2c702bc4452358# Parent  eabe4df21c7778cd7dc3171a0527329cbbd4464d
merge of '0f830f30f43a1884816673b67f0931e686e3eb43'
     and '7252f6d90b58743d43846859e467f2cf4a79c864'

diff -r 70da0f9007b5 -r e374fea71214 ChangeLog
--- a/ChangeLog	Sat Feb 18 23:30:01 2012 +0000
+++ b/ChangeLog	Sat Feb 18 23:43:18 2012 +0000
@@ -6,8 +6,6 @@
 	  conversation menu. (Howard Chu) (#14818)
 
 	AIM and ICQ:
-	* Don't try to format ICQ usernames entered as email addresses.
-	  Gets rid of an "Unable to format username" error at login. (#13883)
 	* Make buddy list management code more efficient. (Oliver) (#4816)
 
 	Bonjour: