Merge branch 'stable-3.1'

Marius Burkard

2016-01-31 3117f2e70389b0a3e03a683ec8b03e4e0a7eea87

 interface/web/client/templates/reseller_edit_limits.htm

@@ -177,7 +177,7 @@
        </a>
      </h4>
    </div>
    <div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail>
    <div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail">
      <div class="panel-body">&nbsp;
            <div class="form-group">
                    <label for="mail_servers" class="col-sm-3 control-label">{tmpl_var name='mail_servers_txt'}</label>