propagate from branch 'im.pidgin.pidgin' (head 8378e2c3865ed41283635095661e130bcd298f65)

            to branch 'im.pidgin.pidgin.next.minor' (head e44f52e9f3e96d812e42c58b67ae6e48e3ee55b5)

1 files changed, 12 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 2ab6826ec7..32465d6387 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,19 @@ version 2.7.0 (??/??/????):
 	  Information" dialog accessible on the Help menu.
 
 version 2.6.3 (??/??/20??):
+	General:
+	* New 'plugins' sub-command to 'debug' command (i.e. '/debug plugins')
+	  to announce the list of loaded plugins (in both Finch and Pidgin).
+	* Fix a crash when performing DNS queries on Unixes that use the
+	  blocking DNS lookups.  (Brian Lu)
+	* Fix building the GnuTLS plugin with older versions of GnuTLS.
+
+	MSN:
+	* Don't forget display names for buddies.
+
 	XMPP:
+	* Users connecting to Google Talk now have an "Initiate Chat" context menu
+	  option for their buddies.  (Eion Robb)
 	* Fix a crash when attempting to validate an invalid JID.
 	* Resolve an issue when connecting to iChat Server when no resource
 	  is specified.
@@ -27,14 +39,6 @@ version 2.6.3 (??/??/20??):
 	* Add support for adding OCS and Sametime buddies.  OCS users are added
 	  as "ocs/user@domain.tld" and Sametime users are added as
 	  "ibm/sametime_id".  (Jason Cohen)
-
-	General:
-	* New 'plugins' sub-command to 'debug' command (i.e. '/debug plugins')
-	  to announce the list of loaded plugins (in both Finch and Pidgin).
-	* Fix a crash when performing DNS queries on Unixes that use the
-	  blocking DNS lookups.  (Brian Lu)
-	* Fix building the GnuTLS plugin with older versions of GnuTLS.
-
 	Finch:
 	* The TinyURL plugin now creates shorter URLs for long non-conversation
 	  URLs, e.g. URLs to open Inbox in Yahoo/MSN protocols, or the Yahoo