Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

diff --git a/README b/README
index 10792c155912ce0301ce4eedb9ecfdd23c6e5181..44bdd8fe200036a2fb9e25e631e052275358ed8c 100644 (file)
--- a/README
+++ b/README
@@ -115,6 +115,8 @@ Notable changes this version:
 - Plugin to support RSSCloud
 - A framework for adding advertisements to a public site,
   and plugins for Google AdSense and OpenX server
+- Plugins to throttle excessive subscriptions and registrations.
+- A plugin to blacklist particular URLs or nicknames.
 
 There are also literally thousands of bugs fixed and minor features
 added. A full changelog is available at http://status.net/wiki/StatusNet_0.9.0.