Merge commit 'origin/master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 11 Oct 2008 17:21:03 +0000 (19:21 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 11 Oct 2008 17:21:03 +0000 (19:21 +0200)
commit4478f95efc07709dbe0a4415e979ff0347651cf8
tree73f257249de2e3edec8ce6a3d19bab89fd66f9b5
parent88cddbaa6de3733235749777e7e20aa2c51e884c
parentd1f2e37b60955eafb9f08a843fa30038cf298798
Merge commit 'origin/master' into hruid

Conflicts:
modules/email.php
templates/emails/redirect.tpl

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
modules/admin.php
modules/email.php
modules/lists.php
modules/profile.php
templates/emails/redirect.tpl