# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1212966024 0
# Node ID 6595af65ef459787dcf6fa70f1f7dff5bca6a9d0
# Parent  aec041e8f3e07abafbc80e015da831db91574840
Fix this wording to express that this is related to adding new buddies.

diff -r aec041e8f3e0 -r 6595af65ef45 ChangeLog
--- a/ChangeLog	Sun Jun 08 22:51:29 2008 +0000
+++ b/ChangeLog	Sun Jun 08 23:00:24 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