Merge commit 'origin/master' into fusionax
authorStéphane Jacob <jacou@melix.net>
Sun, 14 Sep 2008 17:44:28 +0000 (19:44 +0200)
committerStéphane Jacob <jacou@melix.net>
Sun, 14 Sep 2008 17:44:28 +0000 (19:44 +0200)
commit7972436ae72911c7f2e8d5f3a26204a7ca0ee39d
tree6c1d004caef41709b49b231c9303426126629e4c
parent73be44347c469de3cf128923e0221b4244915fa6
parentc66de9a010aefa5a0e8593a0bb205caf9957232b
Merge commit 'origin/master' into fusionax
modules/email.php
templates/emails/redirect.tpl