diff ChangeLog @ 19452:eb0fe583bc53

merge of 'cacb6312fda77c93ab3e7557fdea3c2956cc55ad' and 'f5aeed9a6e0c9cb68e829608dc9d41f7782fe487'
author Kevin Stange <kevin@simguy.net>
date Sun, 26 Aug 2007 18:59:59 +0000
parents 64f226232133
children bb5ec4f1e25b
line wrap: on
line diff
--- a/ChangeLog	Sun Aug 26 18:51:06 2007 +0000
+++ b/ChangeLog	Sun Aug 26 18:59:59 2007 +0000
@@ -4,6 +4,9 @@
 	* New protocol plugin: MySpaceIM (Jeff Connelly, Google Summer of
 	  Code)
 
+	Finch:
+	* Per-conversation mute and logging options (accessible from the menu)
+
 version 2.1.1 (08/20/2007):
 	Yahoo:
 	* Added an account action to open your inbox in the yahoo prpl.