Merge commit 'origin/master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 28 Sep 2008 11:14:11 +0000 (13:14 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 28 Sep 2008 11:14:11 +0000 (13:14 +0200)
commit0c8cd507ad27b70c20e9f056b77fc286ee88e04f
treeca41e0288fe4b76a16bd5bb5c18057c440f6be62
parent21c7c593d7100a887f984c49a82c03eb32169fc4
parente0e27d631c07e67207c5e66d1ea58d167c920f36
Merge commit 'origin/master' into hruid
bin/cron/emails.check.php
classes/xorgsession.php
modules/marketing.php
templates/admin/utilisateurs.tpl
templates/emails/send.tpl
templates/include/form.valid.mark.tpl
templates/marketing/private.tpl
templates/marketing/public.tpl