Merge branch 'magento-1.9.4.0' of git.kawatest.de:magento1.9.x into magento-1.9.4.0

Author: René Mütterlein

app/design/frontend/egov/default/template/persistent/customer/form/register.phtml

@@ -257,7 +257,7 @@
                             <span class="required">*</span>
                             <?php echo $this->__('Password') ?>
                         </label>
-                        <?php $minPasswordLength = max((int)$this->getCustomer()->getMinPasswordLength(), Mage_Core_Model_App::ABSOLUTE_MIN_PASSWORD_LENGTH); ?>
+                        <?php $minPasswordLength = $this->getMinPasswordLength(); ?>
                         <input tabindex="16"
                                type="password"
                                name="password"