Merge remote branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 20 Feb 2011 18:17:51 +0000 (19:17 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 20 Feb 2011 18:17:51 +0000 (19:17 +0100)
commit76362eeb011de4f2cd7825f557643a72494475f9
treedace0567cb569e9ed870ab402a73e5be69b6c303
parent905ab10422941d19d99b4957c009914a64d19399
parenta386dd97793c5b24434f588e791932f9fbcfec1c
Merge remote branch 'origin/xorg/maint' into xorg/master

Conflicts:
configs/mails.conf

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
configs/mails.conf
modules/admin.php
modules/xnetgrp.php