Merge branch 'xorg/master' into xorg/f/xnet-accounts
authorStéphane Jacob <sj@m4x.org>
Fri, 7 Jan 2011 13:44:53 +0000 (14:44 +0100)
committerStéphane Jacob <sj@m4x.org>
Fri, 7 Jan 2011 13:44:53 +0000 (14:44 +0100)
commitce0d7be772306674fadaf020511871aba1683816
tree71302fb316c346641abc78de4bf0ab873abbdf73
parent150f29f1d0b305fc57d48da0fca13c19e176ca0e
parentfc34b3d17fdbc520ddc88f57b9b1eb9dbab0013a
Merge branch 'xorg/master' into xorg/f/xnet-accounts
classes/user.php
classes/xnetpage.php
configs/mails.conf
htdocs/javascript/password.js
modules/xnet.php
modules/xnetgrp.php
templates/xnet/skin.tpl
templates/xnetgrp/membres-del.tpl
templates/xnetgrp/membres-edit.tpl