Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/dns/templates/dns_spf_edit.htm

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