Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Till Brehm

2014-05-11 9b155852f4a352ddb793ac4252702170b6509c17

 interface/web/mail/templates/mail_get_edit.htm

@@ -26,7 +26,7 @@
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='source_delete_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='source_delete'}
                    {tmpl_var name='source_delete'} {tmpl_var name="source_delete_note_txt"}
                </div>
            </div>
            <div class="ctrlHolder">