Merge branch 'master' into 'master'

Marius Cramer

2015-08-27 7b26eae1b657e81aefe2a50e1c15518f0f6ee935

 interface/web/admin/templates/server_edit_services.htm

@@ -45,6 +45,12 @@
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='xmpp_server_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='xmpp_server'}
                </div>
            </div>
            <div class="form-group">
                <label for="mirror_server_id" class="col-sm-3 control-label">{tmpl_var name='mirror_server_id_txt'}</label>
                <div class="col-sm-9"><select name="mirror_server_id" id="server_id" class="form-control">
                    {tmpl_var name='mirror_server_id'}