From 7c2179f4b8604da1167b29ffb92041cf16fc4dbc Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 13 Mar 2014 07:37:47 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

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

diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index 82373e7..c563122 100644
--- a/install/tpl/system.ini.master
+++ b/install/tpl/system.ini.master
@@ -52,3 +52,5 @@
 customer_no_counter=0
 session_timeout=0
 session_allow_endless=0
+min_password_length=5
+min_password_strength=0

--
Gitblit v1.9.1