# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1212966036 0
# Node ID 85ca57711e931d8f34d31149e1214b3ee0fce19a
# Parent  6595af65ef459787dcf6fa70f1f7dff5bca6a9d0# Parent  97a01e09a3b43c5e225ed38cd49a0e9fef16e3c8
merge of 'f7176494034dd112dc3416db787a73b6dc67007b'
     and 'fcc768ad62bc878c93d5b88b758d5e17251c9ebe'

diff -r 97a01e09a3b4 -r 85ca57711e93 ChangeLog
--- a/ChangeLog	Sun Jun 08 22:59:32 2008 +0000
+++ b/ChangeLog	Sun Jun 08 23:00:36 2008 +0000
@@ -13,8 +13,8 @@
 	  entries via the buddy list entry right-click menu.
 	* Resize large incoming custom smileys to a maximum of 96px on either
 	  side.
-	* Automatically offer to merge buddies into the same contact if the
-	  alias given matches that of existing buddies in the same group.
+	* Offer to add new buddies into the same contact as existing buddies
+          in the same group if the alias given is the same.
 
 	General:
 	* Group and Chat buddy list entries can now be given custom buddy