Merge branch 'master' of /home/git/platal
authorStéphane Jacob <jacou@melix.net>
Mon, 19 May 2008 23:32:41 +0000 (01:32 +0200)
committerStéphane Jacob <jacou@melix.net>
Mon, 19 May 2008 23:32:41 +0000 (01:32 +0200)
commit214d92b0cef6c4298a2769242ebae5c31e27955a
treee987ee9bda9a6c022a3177431139e6d8a9b05ad3
parent661e78f78066017efebd826c564d625e26dfeca9
parent27614f4c1752e957908a067c5e6ca4f69b0fcae3
Merge branch 'master' of /home/git/platal
modules/email.php
templates/admin/utilisateurs.tpl