Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master

author Florent Bruneau <florent.bruneau@polytechnique.org>

Sun, 2 Jan 2011 20:08:54 +0000 (21:08 +0100)

committer Florent Bruneau <florent.bruneau@polytechnique.org>

Sun, 2 Jan 2011 20:08:54 +0000 (21:08 +0100)
author Florent Bruneau <florent.bruneau@polytechnique.org>
Sun, 2 Jan 2011 20:08:54 +0000 (21:08 +0100)
committer Florent Bruneau <florent.bruneau@polytechnique.org>
Sun, 2 Jan 2011 20:08:54 +0000 (21:08 +0100)
diff --cc modules/payment.php
Simple merge
diff --cc modules/register.php
Simple merge
author	Florent Bruneau <florent.bruneau@polytechnique.org>
	Sun, 2 Jan 2011 20:08:54 +0000 (21:08 +0100)
committer	Florent Bruneau <florent.bruneau@polytechnique.org>
	Sun, 2 Jan 2011 20:08:54 +0000 (21:08 +0100)
		1	2
modules/payment.php	patch \|	diff1 \|	diff2 \|	blob \| history
modules/register.php	patch \|	diff1 \|	diff2 \|	blob \| history