Merge branch '0.9.x' into 1.0.x

Conflicts:
	EVENTS.txt
	db/statusnet.sql
	lib/queuemanager.php

1 files changed, 7 insertions, 0 deletions

diff --git a/db/statusnet.sql b/db/statusnet.sql
index 0cf057256..d6f0f54a2 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -643,3 +643,10 @@ create table user_im_prefs (
     constraint primary key (user_id, transport),
     constraint unique key `transport_screenname_key` ( `transport` , `screenname` )
 );
+
+create table conversation (
+    id integer auto_increment primary key comment 'unique identifier',
+    uri varchar(225) unique comment 'URI of the conversation',
+    created datetime not null comment 'date this record was created',
+    modified timestamp comment 'date this record was modified'
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;