Merge branch '0.9.x' into testing

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index ff4ef2c1420f8cf0e4149950c5e5918d929f99f9..2cc37dbfefa2b327287eb6b3b1d1c9bcd8cadf48 100644 (file)
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -544,3 +544,24 @@ modified = 384
 
 [user_group__keys]
 id = N
+
+[user_openid]
+canonical = 130
+display = 130
+user_id = 129
+created = 142
+modified = 384
+
+[user_openid__keys]
+canonical = K
+display = U
+
+[user_openid_trustroot]
+trustroot = 130
+user_id = 129
+created = 142
+modified = 384
+
+[user_openid__keys]
+trustroot = K
+user_id = K
\ No newline at end of file

diff --git a/lib/common.php b/lib/common.php
index 732c22bfdf6d641fa13f8daf1978d4f7760f52f4..9b3ded037b3701d305e5db20a5f0ed8abb7ee58a 100644 (file)
--- 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.0dev');
+define('STATUSNET_VERSION', '0.9.0rc1');
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
 define('STATUSNET_CODENAME', 'Stand');