changeset 24844:1fdec6aa8578

merge of '518ebe34a3f1499bab1208e43f5e9acf69c4ca3e' and 'd092049f615e0cfd10ade1cb459e0827a01638fa'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 27 Dec 2008 09:37:12 +0000
parents 38fbc2e3c646 (current diff) 90227761bc7d (diff)
children 9a371554f686 43b721aa4b76
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Dec 27 09:37:08 2008 +0000
+++ b/ChangeLog	Sat Dec 27 09:37:12 2008 +0000
@@ -130,7 +130,7 @@
 	  if no custom smilies have previously been added using the smiley
 	  manager.
 	* Improved support for some message formatting in conversations.
-	* Allow focusing the coversation history or userlist with F6.
+	* Allow focusing the conversation history or userlist with F6.
 	* Fixed the Send Button plugin to avoid duplicate buttons in a single
 	  conversation.
 	* Double-clicking a saved status will now activate it and close the