Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/admin/templates/system_config_mail_edit.htm

@@ -12,6 +12,24 @@
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='mailbox_show_autoresponder_tab_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='mailbox_show_autoresponder_tab'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='mailbox_show_mail_filter_tab_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='mailbox_show_mail_filter_tab'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='mailbox_show_custom_rules_tab_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='mailbox_show_custom_rules_tab'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='mailboxlist_webmail_link_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='mailboxlist_webmail_link'}
@@ -77,4 +95,4 @@
        </div>
    </div>
  
</div>
</div>