Merge branch 'stable-3.1'

Marius Burkard

2016-04-26 5152e9a75e6e0ed4dc26358e4e608ce684147b32

 interface/web/admin/templates/server_config_rescue_edit.htm

@@ -17,12 +17,14 @@
                    {tmpl_var name='do_not_try_rescue_httpd'}
                </div>
            </div>
<!--
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_mongodb_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='do_not_try_rescue_mongodb'}
                </div>
            </div>
-->
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_mysql_txt'}</label>
                <div class="col-sm-9">