# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1189751278 0
# Node ID 69bd73dab9dbf26040fa0d84c6c209a184238d4b
# Parent  3a33c282cc61a849941369d27ca9a352b69e1c34# Parent  d0ef16fd650fd2c8da4ab6c2fd7540c1aa85225a
merge of '0befa035e9ed7dd56124bd9f33fa7111a6eaf95b'
     and '4b4d38a22a9dc4d8eb2d880760fd35e16188114f'

diff -r 3a33c282cc61 -r 69bd73dab9db ChangeLog
--- a/ChangeLog	Fri Sep 14 06:24:56 2007 +0000
+++ b/ChangeLog	Fri Sep 14 06:27:58 2007 +0000
@@ -9,17 +9,21 @@
 	  Monitzer, Google Summer of Code for Adium)
 	* Certificate management. Libpurple will validate certificates on
 	  SSL-encrypted protocols (William Ehlhardt, Google Summer of Code)
+	* Some adjustments were made to fix sending messages when using
+	  the MSN HTTP method. (Laszlo Pandy)
 
 	Pidgin:
-	* Insert Horizontal Rules and Strikethrough text from toolbar
+	* Insert Horizontal Rules and Strikethrough text from toolbar.
 	* Option to show protocol icons in the buddy list, from the
-	  Buddies > Show menu (Justin Heiner)
-	* Ability to build with native, non-X11 GTK+ on OSX (Anders
+	  Buddies > Show menu. (Justin Heiner)
+	* Ability to build with native, non-X11 GTK+ on OSX. (Anders
 	  Hasselqvist)
-	* Remember the 'Enable Sounds' setting for a conversation
+	* Remember the 'Enable Sounds' setting for a conversation.
+	* Right-clicking the empty space in the formatting toolbar
+	  allows you to toggle back to the old "ungrouped" version.
 
 	Finch:
-	* Per-conversation mute and logging options (accessible from the menu)
+	* Per-conversation mute and logging options (accessible from the menu).
 
 version 2.1.1 (08/20/2007):
 	Yahoo: