Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-26 2e86dd528354a8267521e045a185f920683e4724

 interface/web/sites/templates/web_vhost_domain_edit.htm

@@ -74,7 +74,7 @@
                    {tmpl_var name='ip_address'}
                </select></div>
            </div>
            <div class="form-group" style="display:none">
            <div class="form-group">
                <label for="ipv6_address" class="col-sm-3 control-label">{tmpl_var name='ipv6_address_txt'}</label>
                <div class="col-sm-9"><select name="ipv6_address" id="ipv6_address" class="form-control">
                    {tmpl_var name='ipv6_address'}