Merge remote branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 16 Feb 2011 21:26:28 +0000 (22:26 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 16 Feb 2011 21:26:28 +0000 (22:26 +0100)
commit82af3fc3b6e003b0cbbcf4faf4ed4f0ea5c07570
treeea2c494d12ec296b136749a2e58a45ae35433288
parent6c21094e45512da7fb1321a1df4335b1d48ed9bd
parent26ba053e75092d038f571b77eaf3005509da0648
Merge remote branch 'origin/xorg/maint' into xorg/master

Conflicts:
core
modules/admin.php
modules/carnet.php
modules/events.php
modules/payment.php
modules/survey.php
modules/xnetgrp.php
plugins/function.poison.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
28 files changed:
classes/address.php
classes/jobterms.php
classes/user.php
classes/xorg.php
core
include/banana/forum.inc.php
include/profilefields.inc.php
include/validations/listes.inc.php
modules/admin.php
modules/bandeau.php
modules/carnet.php
modules/carnet/contacts.pdf.inc.php
modules/events.php
modules/googleapps.php
modules/payment.php
modules/payment/money/bplccyberplus.inc.php
modules/payment/money/paypal.inc.php
modules/platal.php
modules/profile.php
modules/profile/jobs.inc.php
modules/profile/skills.inc.php
modules/register.php
modules/search.php
modules/survey.php
modules/xnetevents.php
modules/xnetevents/xnetevents.inc.php
modules/xnetgrp.php
plugins/function.poison.php