Merge branch 'xorg/master' into xorg/f/xnet-accounts
authorStéphane Jacob <sj@m4x.org>
Mon, 14 Mar 2011 18:01:52 +0000 (19:01 +0100)
committerStéphane Jacob <sj@m4x.org>
Mon, 14 Mar 2011 18:01:52 +0000 (19:01 +0100)
commit45ea6160465aeba0aa780e49c12272819dedffd1
treee36690e6fea3df129a61bb8d86123282afac45d3
parentce0d7be772306674fadaf020511871aba1683816
parent5c11ce3d14becb0799434db3f1c6cc37eab3ca0f
Merge branch 'xorg/master' into xorg/f/xnet-accounts
classes/user.php
classes/xnetpage.php
configs/mails.conf
modules/xnet.php
modules/xnetgrp.php
modules/xnetnl.php
templates/xnet/skin.tpl
templates/xnetgrp/membres-edit.tpl