merge of 'f97886592c42fb09b934be03cd77d557d857ffb8'

Sat, 27 Dec 2008 09:37:12 +0000

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Sat, 27 Dec 2008 09:37:12 +0000
changeset 25314
a4359f8d6420
parent 25313
f97886592c42 (current diff)
parent 25310
d4fff262c356 (diff)
child 25315
a1fd26e965ac
child 25854
56a02cb817d9

merge of 'f97886592c42fb09b934be03cd77d557d857ffb8'
and 'd4fff262c356ede806607cc519bdfe67093bdb60'

--- 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

mercurial