diff ChangeLog @ 29340:3422481df7ba

merge of '19b1f405b1e0f78a95bd14e8303d1a2c19818908' and '884bb785d674029cb52e46cb82a86241df13bf46'

--- a/ChangeLog	Wed Feb 03 21:05:44 2010 +0000
+++ b/ChangeLog	Wed Feb 03 21:17:30 2010 +0000
@@ -37,6 +37,9 @@
 	  with some clients.
 	* Don't do an SRV lookup for a STUN server associated with the account
 	  if one is already set globally in prefs.
+	* Don't send custom smileys larger than the recommended maximum object size
+	  specified in the BoB XEP. Will prevent getting disconnected because of
+	  sending to large stanzas.
 
 	Yahoo:
 	* Don't send <span> and </span> tags.  (Fartash Faghri)