diff README @ 58:31374ae054b0

branch merge

--- a/README	Sat May 17 21:03:17 2008 +0900
+++ b/README	Sat May 17 21:05:12 2008 +0900
@@ -101,13 +101,15 @@
 Fixed a crash bug that each unload and reload pidgin-twitter cycle
 resulted in crash.
 
-0.6.0 (In near future in 2008)
-- Added letter counter.
-- Suppress "False positive oops message" when sending message which
-exceeds 140 bytes but actual length is within 140 characters.
-- pidgin-twitter now strips all markup elements on sending a
-message. This feature prevents this plugin from posting unexpected
-excessively markuped message.
+0.6.0 (May 16 2008)
+- Letter counter has been added.
+- Suppress "false positive oops message" when sending message which
+  exceeds 140 bytes but within 140 characters.
+- Pidgin-twitter now strips all markup elements from sending message.
+  This feature prevents this plugin from posting unexpected
+  excessively marked up message.
+- Since pidgin-twitter no longer sends any marked up message, all
+  markup widgets in conversation window has been disabled.
 
 
 6. Acknowledgments
@@ -119,8 +121,8 @@
 convcharcount plugin.
 
 In development for 0.6.0, mikanbako (@mikanbako) joined our team and
-contributed numerous efforts. The original strip markup feature has
-been developed by him.
+contributed numerous efforts. The original strip markup feature and
+the disable markup widgets feature has been developed by him.
 
 
 Yoshiki Yazawa (@yazuuchi) and the pidgin-twitter team