changeset 28622:2e78aca08742

merge of '94344158f35dde02dc906e3e5e39e58a326ff1be' and 'e678005b4a80403eab51365dced9586b52416176'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 22 Nov 2009 23:11:19 +0000
parents 2ab56f7e801e (diff) ca0f113fee11 (current diff)
children a401d3500a75 730ed9c1c780
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Nov 22 23:05:51 2009 +0000
+++ b/ChangeLog	Sun Nov 22 23:11:19 2009 +0000
@@ -21,7 +21,7 @@
 	  the clientLogin authentication method.
 	* Fix offline message retrieval (broken in 2.6.3)
 	* Fix SSL when clientLogin is enabled.
-    * Fix sending and receiving Unicode characters in a Direct IM
+	* Fix sending and receiving Unicode characters in a Direct IM
 
 	MSN:
 	* Don't forget display names for buddies.
@@ -40,7 +40,7 @@
 	* Resolve an issue when connecting to iChat Server when no resource
 	  is specified.
 	* Try to automatically find a STUN server by using an SRV lookup on the
-	  account's domain, and use that for voice and video if found and the user 
+	  account's domain, and use that for voice and video if found and the user
 	  didn't set one manually in prefs.
 	* Fix a crash when adding a buddy without an '@'.
 	* Don't show the option to send a file to a buddy if we know for certain