Merge branch 'dbconfig' into 0.9.x

Conflicts:
	lib/common.php

1 files changed, 10 insertions, 0 deletions

diff --git a/db/laconica.sql b/db/laconica.sql
index 56bd4b1e3..1662ef7a8 100644
--- a/db/laconica.sql
+++ b/db/laconica.sql
@@ -547,3 +547,13 @@ create table deleted_notice (
     index deleted_notice_profile_id_idx (profile_id)
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table config (
+
+    section varchar(32) comment 'configuration section',
+    setting varchar(32) comment 'configuration setting',
+    value varchar(255) comment 'configuration value',
+
+    constraint primary key (section, setting)
+
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;