Merge commit 'origin/master' into fusionax
authorStéphane Jacob <jacou@melix.net>
Tue, 7 Oct 2008 10:36:09 +0000 (12:36 +0200)
committerStéphane Jacob <jacou@melix.net>
Tue, 7 Oct 2008 10:36:09 +0000 (12:36 +0200)
commitf875fdc7a9cd2b879598a1e0ac0cb73456e4e809
tree47d23379008c3776c3c30da04bcceec659a6ea1d
parent29459c499c3c88fb9cdd34413dcbd5370d3573d3
parentd1f2e37b60955eafb9f08a843fa30038cf298798
Merge commit 'origin/master' into fusionax
modules/email.php
modules/profile.php
templates/emails/redirect.tpl
templates/events/index.tpl