Merge branch 'master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Mon, 30 Jun 2008 21:00:19 +0000 (23:00 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Mon, 30 Jun 2008 21:00:19 +0000 (23:00 +0200)
commitc72cef4cd6acfacbfdc72f0b4173237228df6b68
treea681bdeed1cc9ced57854dda1070bb6d7b7f82b7
parentb8971a3ed64f3ba69becf1cd8f3b32ee2292026d
parent1610f13adfdd3cadd5fba359973b8e04afc1e527
Merge branch 'master' into hruid

Conflicts:
include/user.func.inc.php
include/vcard.inc.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
include/user.func.inc.php
include/vcard.inc.php
modules/lists.php
modules/profile.php
modules/xnetgrp.php