From 5cc181a90f7d27f4ec578a8a892b4dd0ca44adf4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Sep 2015 03:09:10 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 install/sql/ispconfig3.sql |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 1ed6e5e..6089f3f 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1004,6 +1004,7 @@
   `ip_address` varchar(39) DEFAULT NULL,
   `vm_id` int(11) NOT NULL DEFAULT '0',
   `reserved` varchar(255) NOT NULL DEFAULT 'n',
+  `additional` varchar(255) NOT NULL DEFAULT 'n',
   PRIMARY KEY (`ip_address_id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 ;
 

--
Gitblit v1.9.1