From 22e5abc44844ffb4aa6a6eaf301d6fde633908e9 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 17 Oct 2014 08:06:38 -0400
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

---
 install/sql/incremental/upd_0062.sql |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/sql/incremental/upd_0062.sql b/install/sql/incremental/upd_0062.sql
index d68d2bf..cee5ff9 100644
--- a/install/sql/incremental/upd_0062.sql
+++ b/install/sql/incremental/upd_0062.sql
@@ -10,5 +10,5 @@
   PRIMARY KEY (`backup_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
-ALTER TABLE `mail_user` ADD `backup_interval` VARCHAR( 255 ) NOT NULL ;
+ALTER TABLE `mail_user` ADD `backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none';
 ALTER TABLE `mail_user` ADD `backup_copies` INT NOT NULL DEFAULT '1';

--
Gitblit v1.9.1