pidgin: f7176494: Fix this wording to express that this is...

[kstange at pidgin.im]

-----------------------------------------------------------------
Revision: f7176494034dd112dc3416db787a73b6dc67007b
Ancestor: 832388016fc893f5c5d8569130fe34914c3c4cb0
Author: kstange at pidgin.im
Date: 2008-06-08T23:00:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f7176494034dd112dc3416db787a73b6dc67007b

Modified files:
        ChangeLog

ChangeLog: 

Fix this wording to express that this is related to adding new buddies.

-------------- next part --------------
============================================================
--- ChangeLog	3617bff2b4de11c52411e2999c08550f2e5cc7b9
+++ ChangeLog	cd7b539946d50225b719f5594f4084fddeaf3efe
@@ -13,8 +13,8 @@ version 2.5.0 (??/??/2008):
 	  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