Merge commit 'origin/master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 23 Aug 2008 14:22:49 +0000 (16:22 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 23 Aug 2008 14:22:49 +0000 (16:22 +0200)
commitdbbfabe9138005367547465c13e50b98f121bc36
treeffcf1930f3077808ddff12e79d76d726951bd66e
parentc3045b1cd39db61815e78be2602382b8e0259e7c
parent7e846cdf3eccd46da782dd6eba28043c842c2949
Merge commit 'origin/master' into hruid

Conflicts:
classes/xnetsession.php
classes/xorgsession.php
core

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
14 files changed:
classes/xnetsession.php
classes/xorgsession.php
include/banana/hooks.inc.php
include/userset.inc.php
modules/axletter.php
modules/carnet.php
modules/lists.php
modules/marketing.php
modules/platal.php
modules/profile.php
modules/register.php
modules/search.php
modules/xnetevents/xnetevents.inc.php
modules/xnetgrp.php