Mercurial > pidgin
changeset 32527:e374fea71214
merge of '0f830f30f43a1884816673b67f0931e686e3eb43'
and '7252f6d90b58743d43846859e467f2cf4a79c864'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 18 Feb 2012 23:43:18 +0000 |
| parents | 70da0f9007b5 (current diff) eabe4df21c77 (diff) |
| children | 11c9664778d7 |
| files | ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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: