Merge branch '0.9.x' into testing

1 files changed, 11 insertions, 1 deletions

diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index cd72d66ea..81b329d1e 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -570,4 +570,14 @@ create table profile_role (
 
     primary key (profile_id, role)
 
-);
\ No newline at end of file
+);
+
+create table login_token (
+    user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
+    token char(32) not null /* comment 'token useable for logging in'*/,
+    created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
+    modified timestamp /* comment 'date this record was modified'*/,
+
+    primary key (user_id)
+);
+