From 7f9ab683b259fc93d507eb705c84af0cfd2fae5b Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Mon, 16 Aug 2010 13:26:27 +1200
Subject: fixed a %d that should be a %s in an error message

---
 lib/installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/installer.php b/lib/installer.php
index ff2bed140..2eff2d85a 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -319,7 +319,7 @@ abstract class Installer
             $this->updateStatus(sprintf("Adding %s data to database...", $name));
             $res = $this->runDbScript($scr.'.sql', $conn, 'pgsql');
             if ($res === false) {
-                $this->updateStatus(sprintf("Can't run %d script.", $name), true);
+                $this->updateStatus(sprintf("Can't run %s script.", $name), true);
                 return false;
             }
         }
-- 
cgit v1.2.3-54-g00ecf


From b2a5e0d09b6ef93c265fe4542725de4a7472b103 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 16 Aug 2010 10:09:33 -0700
Subject: StatusNet 0.9.4 "Orange Crush"

---
 README         | 7 ++-----
 lib/common.php | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/README b/README
index 93b63c2ac..e5cb2c933 100644
--- a/README
+++ b/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
diff --git a/lib/common.php b/lib/common.php
index 897d08b77..097f19268 100644
--- a/lib/common.php
+++ b/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');
-- 
cgit v1.2.3-54-g00ecf