Merge branch 'master' into 0.9.x

README

@@ -2,8 +2,8 @@
 README
 ------
 
-StatusNet 0.9.4beta2
-11 August 2010
+StatusNet 0.9.4 "Orange Crush"
+16 August 2010
 
 This is the README file for StatusNet, the Open Source microblogging
 platform. It includes installation instructions, descriptions of
@@ -88,9 +88,6 @@ For best compatibility with client software and site federation, and a lot of
 bug fixes, it is highly recommended that all public sites upgrade to the new
 version.
 
-Changes from 0.9.4beta1:
-- fix for daemon config switching on multi-site setup
-
 Notable changes this version:
 
 - OpenID and OAuth libraries patched for potential timing attack

lib/common.php

@@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_VERSION', '0.9.4beta2');
+define('STATUSNET_VERSION', '0.9.4');
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
 define('STATUSNET_CODENAME', 'Orange Crush');