Merge branch 'xorg/1.0.2/master' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 16 Jan 2011 16:45:48 +0000 (17:45 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 16 Jan 2011 16:45:48 +0000 (17:45 +0100)
commita1c554a92888e0b017ba362817a67cc2849a9154
tree48a2edce059eeee9d371c082a0399397eb490e4e
parent3ddf2584d3158f89c2c8dda45ee5499717c71044
parent164566891eef6e4027b2dfccda0040d37f10605b
Merge branch 'xorg/1.0.2/master' into xorg/master
ChangeLog
bin/lists.rpc.py
classes/profile.php
include/userset.inc.php
modules/email.php
modules/fusionax.php
modules/lists.php
modules/xnetevents.php
modules/xnetgrp.php