From b4945ae0c3f4e108090d05b34b3e7df8a753a2ec Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 07 Jul 2014 13:07:17 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 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