diff ChangeLog @ 19454:a650c8294bd2

merge of '0bf01031d132e0c8d3ab091041ec704fcfc2b152' and '5b0dfe36f723f3de64d94f962693b9df13b36a40'
author Kevin Stange <kevin@simguy.net>
date Sun, 26 Aug 2007 19:08:29 +0000
parents 64f226232133
children bb5ec4f1e25b
line wrap: on
line diff
--- a/ChangeLog	Sun Aug 26 19:07:22 2007 +0000
+++ b/ChangeLog	Sun Aug 26 19:08:29 2007 +0000
@@ -1,5 +1,12 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.1.2:
+	* 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.