Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 2 Jan 2011 20:08:54 +0000 (21:08 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 2 Jan 2011 20:08:54 +0000 (21:08 +0100)
commit77de31c98f05be58870afbaa0cb6ba9f6cbb1799
tree18ccf97cbc8a0e74708ce7752cea1ec0fbc3fb73
parent8c5bbd3f286135e2229be855492e00cd940c3550
parentc52be69950d31821a8a091f08ad9170e1042eaf8
Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
modules/payment.php
modules/register.php