Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 22 Feb 2009 14:25:25 +0000 (15:25 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 22 Feb 2009 14:25:25 +0000 (15:25 +0100)
commit5b2c99878fc75a6acffb2239e284f2cb1782142c
treed33164afdb705875918368bc4b8f2b1fc47f8bb5
parent76cbe885cee40ea53bf1c52b70b44d792024f341
parenta93519575833e6886e055abb8b43b3ada6f163bc
Merge commit 'origin/fusionax' into account

Conflicts:

include/userset.inc.php
modules/payment.php
modules/payment/money/paypal.inc.php
modules/profile.php
modules/profile/addresses.inc.php
modules/search.php
modules/xnetevents/xnetevents.inc.php
templates/profile/groupesx.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
12 files changed:
classes/xnetpage.php
configs/platal.ini
include/userset.inc.php
modules/events.php
modules/payment/money/paypal.inc.php
modules/profile.php
modules/profile/addresses.inc.php
modules/profile/jobs.inc.php
modules/profile/mentor.inc.php
modules/profile/page.inc.php
modules/search.php
templates/profile/groupesx.tpl