# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1230370632 0
# Node ID 1fdec6aa8578f52b151290f3b7b398e1566489a2
# Parent  38fbc2e3c646969ada36ec318316852d570f4bce# Parent  90227761bc7dfc9341d8b453184fa878a3d9e30c
merge of '518ebe34a3f1499bab1208e43f5e9acf69c4ca3e'
     and 'd092049f615e0cfd10ade1cb459e0827a01638fa'

diff -r 38fbc2e3c646 -r 1fdec6aa8578 ChangeLog
--- 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