From 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 10:04:06 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 install/tpl/system.ini.master |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index abb8931..14a75e4 100644
--- a/install/tpl/system.ini.master
+++ b/install/tpl/system.ini.master
@@ -23,7 +23,6 @@
 phpmyadmin_url=/phpmyadmin
 webftp_url=
 client_username_web_check_disabled=n
-reseller_can_use_options=n
 
 [tools]
 

--
Gitblit v1.9.1