Merge branch '0.9.x' into 1.0.x

Conflicts:
	actions/confirmaddress.php
	actions/emailsettings.php
	actions/hostmeta.php
	actions/imsettings.php
	actions/login.php
	actions/profilesettings.php
	actions/showgroup.php
	actions/smssettings.php
	actions/urlsettings.php
	actions/userauthorization.php
	actions/userdesignsettings.php
	classes/Memcached_DataObject.php
	index.php
	lib/accountsettingsaction.php
	lib/action.php
	lib/common.php
	lib/connectsettingsaction.php
	lib/designsettings.php
	lib/personalgroupnav.php
	lib/profileaction.php
	lib/userprofile.php
	plugins/ClientSideShorten/ClientSideShortenPlugin.php
	plugins/Facebook/FBConnectSettings.php
	plugins/Facebook/FacebookPlugin.php
	plugins/NewMenu/NewMenuPlugin.php
	plugins/NewMenu/newmenu.css

doc-src/im

@@ -32,19 +32,40 @@ Commands
 You can do some minor management of your account through Jabber. These are the
 currently-implemented commands:
 
-* **on**: Turn on notifications. You'll receive copies of messages by people
-  you subscribe to.
-* **off**: Turn off notifications. You'll no longer receive Jabber
-  notifications.
-* **stop**: Same as 'off'
-* **quit**: Same as 'off'
-* **help**: Show this help. List available Jabber/XMPP commands
-* **follow <nickname>**: Subscribe to <nickname>
-* **sub <nickname>**: Same as follow
-* **leave <nickname>**: Unsubscribe from <nickname>
-* **unsub <nickname>**: Same as leave
-* **d <nickname> <text>**: Send direct message to <nickname> with message body <text>
-* **get <nickname>**: Get last notice from <nickname>
-* **last <nickname>**: Same as 'get'
-* **whois <nickname>**: Get Profile info on <nickname>
-* **fav <nickname>**: Add user's last notice as a favorite
+* **on** - turn on notifications
+* **off** - turn off notifications
+* **help** - show this help
+* **follow <nickname>** - subscribe to user
+* **groups** - lists the groups you have joined
+* **subscriptions** - list the people you follow
+* **subscribers** - list the people that follow you
+* **leave <nickname>** - unsubscribe from user
+* **d <nickname> <text>** - direct message to user
+* **get <nickname>** - get last notice from user
+* **whois <nickname>** - get profile info on user
+* **lose <nickname>** - force user to stop following you
+* **fav <nickname>** - add user's last notice as a 'fave'
+* **fav #<notice_id>** - add notice with the given id as a 'fave'
+* **repeat #<notice_id>** - repeat a notice with a given id
+* **repeat <nickname>** - repeat the last notice from user
+* **reply #<notice_id>** - reply to notice with a given id
+* **reply <nickname>** - reply to the last notice from user
+* **join <group>** - join group
+* **login** - Get a link to login to the web interface
+* **drop <group>** - leave group
+* **stats** - get your stats
+* **stop** - same as 'off'
+* **quit** - same as 'off'
+* **sub <nickname>** - same as 'follow'
+* **unsub <nickname>** - same as 'leave'
+* **last <nickname>** - same as 'get'
+* **on <nickname>** - not yet implemented.
+* **off <nickname>** - not yet implemented.
+* **nudge <nickname>** - remind a user to update.
+* **invite <phone number>** - not yet implemented.
+* **track <word>** - not yet implemented.
+* **untrack <word>** - not yet implemented.
+* **track off** - not yet implemented.
+* **untrack all** - not yet implemented.
+* **tracks** - not yet implemented.
+* **tracking** - not yet implemented.