From 75124b0197a20947b67b502db19af79d4936f306 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 02 Mar 2016 05:43:11 -0500
Subject: [PATCH] Merge branch 'stable-3.1'

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

diff --git a/install/sql/incremental/upd_0063.sql b/install/sql/incremental/upd_0063.sql
index 1422a9e..fc2534a 100644
--- a/install/sql/incremental/upd_0063.sql
+++ b/install/sql/incremental/upd_0063.sql
@@ -18,5 +18,3 @@
 ADD  `policyd_quota_out` int(11) NOT NULL DEFAULT  '-1',
 ADD  `policyd_quota_out_period` int(11) NOT NULL DEFAULT  '24',
 ADD  `policyd_greylist` ENUM(  'Y',  'N' ) NOT NULL DEFAULT  'N';
-
-

--
Gitblit v1.9.1