Merge branch '0.8.x' into 0.9.x

Conflicts:
	README

diff --cc README
index 952c914fec371693ade5d84bd903b443863617bf,a10628ac7f1799d086ac2bb7c95a14262918f0b4..7ecd025ac5e8e91441ca87602b3042365e36ec52
--- 1/README
--- 2/README
+++ b/README
@@@ -150,7 -150,8 +150,9 @@@ released Aug 26 2009. Notable changes t
  - Use the NICKNAME_FMT constant for detecting nicknames.
  - Check for site servername config'd.
  - Compatibility fix for empty status updates with Twitter API.
 +- Option to show files privately (EXPERIMENTAL! Use with caution.)
+ - a script to register a new user.
+ - a script to make a user admin of a group.
  
  Prerequisites
  =============

diff --cc classes/User.php
Simple merge