From 559b657f9fc6a5374de9b7b1caf20abd4e308d76 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 13 Oct 2014 06:38:11 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

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

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

--
Gitblit v1.9.1