Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 20 Sep 2011 18:45:31 +0000 (20:45 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 20 Sep 2011 18:45:31 +0000 (20:45 +0200)
commit7f3ac125d8b532fd0fc643e3504e5bd06be01fc4
tree1b063d6b0de5248a6d7febe3be09bc46551fc144
parent12f38333e3ebcbe0d5b5f62c6addce2338e95665
parent65fae027e8ae613d174d2875825b83c7bae86c6a
Merge branch 'xorg/maint' into xorg/master
modules/auth.php
modules/xnetgrp.php
templates/xnet/account.mail.tpl