Merge commit 'origin/master' into fusionax

author Stéphane Jacob <jacou@melix.net>

Sun, 14 Sep 2008 17:44:28 +0000 (19:44 +0200)

committer Stéphane Jacob <jacou@melix.net>

Sun, 14 Sep 2008 17:44:28 +0000 (19:44 +0200)
author Stéphane Jacob <jacou@melix.net>
Sun, 14 Sep 2008 17:44:28 +0000 (19:44 +0200)
committer Stéphane Jacob <jacou@melix.net>
Sun, 14 Sep 2008 17:44:28 +0000 (19:44 +0200)
diff --cc modules/email.php
Simple merge
diff --cc templates/emails/redirect.tpl
Simple merge
author	Stéphane Jacob <jacou@melix.net>
	Sun, 14 Sep 2008 17:44:28 +0000 (19:44 +0200)
committer	Stéphane Jacob <jacou@melix.net>
	Sun, 14 Sep 2008 17:44:28 +0000 (19:44 +0200)
		1	2
modules/email.php	patch \|	diff1 \|	diff2 \|	blob \| history
templates/emails/redirect.tpl	patch \|	diff1 \|	diff2 \|	blob \| history