Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 2 Jan 2011 20:07:59 +0000 (21:07 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 2 Jan 2011 20:07:59 +0000 (21:07 +0100)
1  2 
modules/register.php

Simple merge