ff589e
Merge branch 'duthils/lufi-fix-english' Conflicts: themes/default/lib/Lufi/I18N/en.po themes/default/lib/Lufi/I18N/fr.po themes/default/templates/mail.html.ep