# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1265233062 0
# Node ID 68cd5a8a3ffe4ec2f75ac657c58f013de99c17be
# Parent  bf0db10b0e3c99e7133a3cd8b7a1fbf285df091e# Parent  3422481df7ba8994c0c10d4abf3c3f76447117ff
merge of '12cc2cc3c1e0012329832ea2d170dca5b31f8b9b'
     and 'bd023f94e67f08aef22c1e266f1cd1eac0dfd998'

diff -r bf0db10b0e3c -r 68cd5a8a3ffe ChangeLog
--- a/ChangeLog	Wed Feb 03 21:34:41 2010 +0000
+++ b/ChangeLog	Wed Feb 03 21:37:42 2010 +0000
@@ -14,6 +14,10 @@
 	* Fix display of avatars after a server-side change. (Krzysztof
 	  Klinikowski)
 
+	AIM:
+	* Allow setting and displaying icons between 1x1 and 100x100 pixels.
+	  Previously only icons between 48x48 and 50x50 were allowed.
+
 	MSN:
 	* File transfer requests will no longer cause a crash if you delete the
 	  file before the other side accepts.