From 45547df91d6510edf3a22dc7cb55303eaeaf63bd Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 25 Nov 2013 08:07:16 -0500
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

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

diff --git a/install/sql/incremental/upd_0036.sql b/install/sql/incremental/upd_0036.sql
index db0d59d..0e5a301 100644
--- a/install/sql/incremental/upd_0036.sql
+++ b/install/sql/incremental/upd_0036.sql
@@ -1,5 +1,4 @@
--- --------------------------------------------------------
+-- --------------------------------------------------------
 
 ALTER TABLE  `web_domain` ADD  `perl` enum('n','y') NOT NULL default 'n' AFTER  `python`;
-
 

--
Gitblit v1.9.1