From 43418672d32ee65ee6060314d4e66c3c44a8b0cb Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 13 Oct 2014 04:59:36 -0400
Subject: [PATCH] Merge branch 'master_fixes' into 'master'

---
 interface/web/admin/templates/server_config_mail_edit.htm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index d21df15..54d6014 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -66,7 +66,7 @@
             <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='mailbox_virtual_uidgid_maps_txt'}</p>
                 <div class="multiField">
-                    {tmpl_var name='mailbox_virtual_uidgid_maps'}
+                    {tmpl_var name='mailbox_virtual_uidgid_maps'}&nbsp;{tmpl_var name='mailbox_virtual_uidgid_maps_info_txt'}
                 </div>
             </div>
             <div class="ctrlHolder">

--
Gitblit v1.9.1