-
fred authored
Conflicts: bureau/admin/main.php bureau/admin/menu.php bureau/admin/menu_adm.php bureau/admin/menu_aide.php bureau/admin/menu_brouteur.php bureau/admin/menu_mail.php bureau/admin/menu_sql.php bureau/admin/styles/base.css bureau/admin/webmail/index.php bureau/class/config.php bureau/class/config_real.php bureau/class/functions.php bureau/class/local.php bureau/class/m_admin.php bureau/class/m_dom.php bureau/class/m_mail.php debian/po/fr.po debian/po/templates.pot src/mail_add src/rawstat.daily
3c61c6f2