Merge branch 'pull'

2012-03-15 16:39:21 -07:00
parent 7684f63ecd 5d2c590fa9
commit 41d595d5bc
28 changed files with 449 additions and 158 deletions
--- a/database.sql
+++ b/database.sql
@@ -638,6 +638,7 @@ CREATE TABLE IF NOT EXISTS `mailacct` (
 `mailbox` CHAR( 255 ) NOT NULL,
 `user` CHAR( 255 ) NOT NULL ,
 `pass` TEXT NOT NULL ,
+`reply_to` CHAR( 255 ) NOT NULL ,
 `action` INT NOT NULL ,
 `movetofolder` CHAR(255) NOT NULL ,
 `pubmail` TINYINT(1) NOT NULL DEFAULT '0',