Merge branch 'stable-3.1'

Marius Burkard

2016-04-06 df8e42319fc83110bd2db2b96b97367f42c71c6c

 interface/web/dns/templates/dns_dmarc_edit.htm

@@ -146,7 +146,7 @@
            <div class="form-group">
                <label class="col-sm-2 control-label">{tmpl_var name='active_txt'}</label>
                <div class="col-sm-3">
                    <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} />
                    {tmpl_var name='active'}
                </div>
            </div>