Merge commit 'origin/master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 21 Sep 2008 20:09:09 +0000 (22:09 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 21 Sep 2008 20:09:09 +0000 (22:09 +0200)
commit805f3d1679a53bb04fff34619c171a1381068612
tree569b58639fb858077e30fe641bc3ffbb0478e671
parent65bb090e3f874f94b1dac69c66a44de581140100
parent20661fd0d378e93d29ab7f31b569152c19e24571
Merge commit 'origin/master' into hruid

Conflicts:
classes/xnetsession.php
include/validations/medals.inc.php
include/validations/nomusage.inc.php
include/validations/photos.inc.php
include/vcard.inc.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
classes/xnetsession.php
include/user.func.inc.php
include/validations/listes.inc.php
include/validations/medals.inc.php
include/validations/nomusage.inc.php
include/validations/photos.inc.php
include/vcard.inc.php
modules/carnet.php
modules/profile.php
modules/xnetgrp.php