Merge remote branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 12 Feb 2011 11:19:38 +0000 (12:19 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 12 Feb 2011 11:19:38 +0000 (12:19 +0100)
commit6c21094e45512da7fb1321a1df4335b1d48ed9bd
tree6327da7496d577c119d29739ea3c63a577322809
parent2e250a1a53de572e11d508b1b30b2472e844bf5a
parent58a552c7d3651fa3547791ce7b03a8869cd187aa
Merge remote branch 'origin/xorg/maint' into xorg/master

Conflicts:
templates/xnetgrp/membres-edit.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
classes/address.php
classes/phone.php
modules/profile/jobs.inc.php
modules/xnetgrp.php
templates/admin/user.tpl
templates/profile/jobs.job.tpl
templates/register/step3.tpl
templates/xnetgrp/membres-edit.tpl